fe / yohoblk-wap · Commits

Go to a project

Authored by 李奇
Commit 9c560b666a6d9db9c0d297dccb682c6f5f9dcdf3 1 parent 82a1e190

session_key添加

Inline Side-by-side
Showing 5 changed files with 205 additions and 18 deletions
... ... @@ -83,7 +83,7 @@ module.exports = {
port: '4444' // influxdb port
},
console: {
level: 'info',
level: 'debug',
colorize: 'all',
prettyPrint: true
}
... ... @@ -124,6 +124,31 @@ if (isProduction) {
service: 'service-yoho-579825100.cn-north-1.elb.amazonaws.com.cn'
}
},
loggers: {
infoFile: {
name: 'info',
level: 'info',
filename: 'logs/info.log',
maxFiles: 7
},
errorFile: {
name: 'error',
level: 'error',
filename: 'logs/error.log',
handleExceptions: true,
maxFiles: 7
},
udp: { // send by udp
level: 'debug', // logger level
host: 'influxdblog.yohoops.org', // influxdb host
port: '4444' // influxdb port
},
console: {
level: 'info',
colorize: 'all',
prettyPrint: true
}
},
report: {
host: 'influxdblog.web.yohoops.org',
port: 8086,
... ...
... ... @@ -26,7 +26,7 @@ module.exports = () => {
return _.parseInt(req.cookies.app_uid);
},
sessionKey: req.cookies.app_session_key,
appVersion: req.query.app_version || req.cookies.app_version || config.appVersion,
appVersion: req.cookies.app_version || req.query.app_version || config.appVersion,
appSessionType: req.cookies.app_client_type
};
}
... ...
... ... @@ -51,7 +51,7 @@
"yoho-cookie": "1.2.0",
"yoho-jquery": "^2.2.4",
"yoho-md5": "^2.0.0",
"yoho-node-lib": "=0.5.6",
"yoho-node-lib": "=0.5.21",
"yoho-qs": "1.0.1",
"yoho-store": "^1.3.20"
},
... ...
... ... @@ -5,7 +5,7 @@ const devInfo = require('./dev-info.js');
let baseConfig = require('./webpack.base.config');
baseConfig.entry.libs.push(path.join(__dirname, '../js/dev.js'));
// baseConfig.entry.libs.push(path.join(__dirname, '../js/dev.js'));
module.exports = merge(baseConfig, {
output: {
... ...
... ... @@ -72,6 +72,15 @@ ajv@^5.0.0, ajv@^5.1.5:
json-schema-traverse "^0.3.0"
json-stable-stringify "^1.0.1"
ajv@^5.1.0:
version "5.3.0"
resolved "http://npm.yoho.cn/ajv/-/ajv-5.3.0.tgz#4414ff74a50879c208ee5fdc826e32c303549eda"
dependencies:
co "^4.6.0"
fast-deep-equal "^1.0.0"
fast-json-stable-stringify "^2.0.0"
json-schema-traverse "^0.3.0"
align-text@^0.1.1, align-text@^0.1.3:
version "0.1.4"
resolved "http://npm.yoho.cn/align-text/-/align-text-0.1.4.tgz#0cd90a561093f35d0a99256c22b7069433fad117"
... ... @@ -311,7 +320,11 @@ aws-sign2@~0.6.0:
version "0.6.0"
resolved "http://npm.yoho.cn/aws-sign2/-/aws-sign2-0.6.0.tgz#14342dd38dbcc94d0e5b87d763cd63612c0e794f"
aws4@^1.2.1:
aws-sign2@~0.7.0:
version "0.7.0"
resolved "http://npm.yoho.cn/aws-sign2/-/aws-sign2-0.7.0.tgz#b46e890934a9591f2d2f6f86d7e6a9f1b3fe76a8"
aws4@^1.2.1, aws4@^1.6.0:
version "1.6.0"
resolved "http://npm.yoho.cn/aws4/-/aws4-1.6.0.tgz#83ef5ca860b2b32e4a0deedee8c771b9db57471e"
... ... @@ -963,6 +976,18 @@ boom@2.x.x:
dependencies:
hoek "2.x.x"
boom@4.x.x:
version "4.3.1"
resolved "http://npm.yoho.cn/boom/-/boom-4.3.1.tgz#4f8a3005cb4a7e3889f749030fd25b96e01d2e31"
dependencies:
hoek "4.x.x"
boom@5.x.x:
version "5.2.0"
resolved "http://npm.yoho.cn/boom/-/boom-5.2.0.tgz#5dd9da6ee3a5f302077436290cb717d3f4a54e02"
dependencies:
hoek "4.x.x"
brace-expansion@^1.1.7:
version "1.1.8"
resolved "http://npm.yoho.cn/brace-expansion/-/brace-expansion-1.1.8.tgz#c07b211c7c952ec1f8efd51a77ef0d1d3990a292"
... ... @@ -1754,6 +1779,12 @@ cryptiles@2.x.x:
dependencies:
boom "2.x.x"
cryptiles@3.x.x:
version "3.1.2"
resolved "http://npm.yoho.cn/cryptiles/-/cryptiles-3.1.2.tgz#a89fbb220f5ce25ec56e8c4aa8a4fd7b5b0d29fe"
dependencies:
boom "5.x.x"
crypto-browserify@3.3.0:
version "3.3.0"
resolved "http://npm.yoho.cn/crypto-browserify/-/crypto-browserify-3.3.0.tgz#b9fc75bb4a0ed61dcf1cd5dae96eb30c9c3e506c"
... ... @@ -2108,6 +2139,13 @@ dns-txt@^2.0.2:
dependencies:
buffer-indexof "^1.0.0"
dnscache@^1.0.1:
version "1.0.1"
resolved "http://npm.yoho.cn/dnscache/-/dnscache-1.0.1.tgz#42cb2b9bfb5e8fbdfa395aac74e127fc05074d31"
dependencies:
asap "~2.0.3"
lodash.clone "~4.3.2"
doctrine@^2.0.0:
version "2.0.0"
resolved "http://npm.yoho.cn/doctrine/-/doctrine-2.0.0.tgz#c73d8d2909d22291e1a007a395804da8b665fe63"
... ... @@ -2680,7 +2718,7 @@ express@^4.13.3, express@^4.14.0, express@^4.15.2:
utils-merge "1.0.0"
vary "~1.1.1"
extend@~3.0.0:
extend@~3.0.0, extend@~3.0.1:
version "3.0.1"
resolved "http://npm.yoho.cn/extend/-/extend-3.0.1.tgz#a755ea7bc1adfcc5a31ce7e762dbaadc5e636444"
... ... @@ -2736,6 +2774,10 @@ fast-deep-equal@^1.0.0:
version "1.0.0"
resolved "http://npm.yoho.cn/fast-deep-equal/-/fast-deep-equal-1.0.0.tgz#96256a3bc975595eb36d82e9929d060d893439ff"
fast-json-stable-stringify@^2.0.0:
version "2.0.0"
resolved "http://npm.yoho.cn/fast-json-stable-stringify/-/fast-json-stable-stringify-2.0.0.tgz#d5142c0caee6b1189f87d3a76111064f86c8bbf2"
fast-levenshtein@~2.0.4:
version "2.0.6"
resolved "http://npm.yoho.cn/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz#3d8a5c66883a16a30ca8643e851f19baa7797917"
... ... @@ -2904,6 +2946,14 @@ form-data@~2.1.1:
combined-stream "^1.0.5"
mime-types "^2.1.12"
form-data@~2.3.1:
version "2.3.1"
resolved "http://npm.yoho.cn/form-data/-/form-data-2.3.1.tgz#6fb94fbd71885306d73d15cc497fe4cc4ecd44bf"
dependencies:
asynckit "^0.4.0"
combined-stream "^1.0.5"
mime-types "^2.1.12"
forwarded@~0.1.0:
version "0.1.0"
resolved "http://npm.yoho.cn/forwarded/-/forwarded-0.1.0.tgz#19ef9874c4ae1c297bcf078fde63a09b66a84363"
... ... @@ -3258,6 +3308,10 @@ har-schema@^1.0.5:
version "1.0.5"
resolved "http://npm.yoho.cn/har-schema/-/har-schema-1.0.5.tgz#d263135f43307c02c602afc8fe95970c0151369e"
har-schema@^2.0.0:
version "2.0.0"
resolved "http://npm.yoho.cn/har-schema/-/har-schema-2.0.0.tgz#a94c2224ebcac04782a0d9035521f24735b7ec92"
har-validator@~2.0.6:
version "2.0.6"
resolved "http://npm.yoho.cn/har-validator/-/har-validator-2.0.6.tgz#cdcbc08188265ad119b6a5a7c8ab70eecfb5d27d"
... ... @@ -3274,6 +3328,13 @@ har-validator@~4.2.1:
ajv "^4.9.1"
har-schema "^1.0.5"
har-validator@~5.0.3:
version "5.0.3"
resolved "http://npm.yoho.cn/har-validator/-/har-validator-5.0.3.tgz#ba402c266194f15956ef15e0fcf242993f6a7dfd"
dependencies:
ajv "^5.1.0"
har-schema "^2.0.0"
has-ansi@^2.0.0:
version "2.0.0"
resolved "http://npm.yoho.cn/has-ansi/-/has-ansi-2.0.0.tgz#34f5049ce1ecdf2b0649af3ef24e45ed35416d91"
... ... @@ -3354,6 +3415,15 @@ hawk@~3.1.3:
hoek "2.x.x"
sntp "1.x.x"
hawk@~6.0.2:
version "6.0.2"
resolved "http://npm.yoho.cn/hawk/-/hawk-6.0.2.tgz#af4d914eb065f9b5ce4d9d11c1cb2126eecc3038"
dependencies:
boom "4.x.x"
cryptiles "3.x.x"
hoek "4.x.x"
sntp "2.x.x"
he@1.1.x, he@^1.1.0:
version "1.1.1"
resolved "http://npm.yoho.cn/he/-/he-1.1.1.tgz#93410fd21b009735151f8868c2f271f3427e23fd"
... ... @@ -3377,6 +3447,10 @@ hoek@2.x.x:
version "2.16.3"
resolved "http://npm.yoho.cn/hoek/-/hoek-2.16.3.tgz#20bb7403d3cea398e91dc4710a8ff1b8274a25ed"
hoek@4.x.x:
version "4.2.0"
resolved "http://npm.yoho.cn/hoek/-/hoek-4.2.0.tgz#72d9d0754f7fe25ca2d01ad8f8f9a9449a89526d"
home-or-tmp@^2.0.0:
version "2.0.0"
resolved "http://npm.yoho.cn/home-or-tmp/-/home-or-tmp-2.0.0.tgz#e36c3f2d2cae7d746a857e38d18d5f32a7882db8"
... ... @@ -3469,6 +3543,14 @@ http-signature@~1.1.0:
jsprim "^1.2.2"
sshpk "^1.7.0"
http-signature@~1.2.0:
version "1.2.0"
resolved "http://npm.yoho.cn/http-signature/-/http-signature-1.2.0.tgz#9aecd925114772f3d95b65a60abb8f7c18fbace1"
dependencies:
assert-plus "^1.0.0"
jsprim "^1.2.2"
sshpk "^1.7.0"
https-browserify@0.0.1:
version "0.0.1"
resolved "http://npm.yoho.cn/https-browserify/-/https-browserify-0.0.1.tgz#3f91365cabe60b77ed0ebba24b454e3e09d95a82"
... ... @@ -3539,12 +3621,13 @@ inflight@^1.0.4:
once "^1.3.0"
wrappy "1"
influx-batch-sender@^0.1.3:
version "0.1.3"
resolved "http://npm.yoho.cn/influx-batch-sender/-/influx-batch-sender-0.1.3.tgz#c2757453aea1021356ff86d0578b6605b79ba9c0"
influx-batch-sender@^0.1.4:
version "0.1.4"
resolved "http://npm.yoho.cn/influx-batch-sender/-/influx-batch-sender-0.1.4.tgz#4eeb139c648b9d153424dd9804b8aa23b20813b9"
dependencies:
debug "^3.0.1"
lodash "^4.17.4"
request "^2.83.0"
influxdb-winston@^1.0.1:
version "1.0.1"
... ... @@ -4131,6 +4214,10 @@ lodash._basecallback@^3.0.0:
lodash.isarray "^3.0.0"
lodash.pairs "^3.0.0"
lodash._baseclone@~4.5.0:
version "4.5.7"
resolved "http://npm.yoho.cn/lodash._baseclone/-/lodash._baseclone-4.5.7.tgz#ce42ade08384ef5d62fa77c30f61a46e686f8434"
lodash._basecopy@^3.0.0:
version "3.0.1"
resolved "http://npm.yoho.cn/lodash._basecopy/-/lodash._basecopy-3.0.1.tgz#8da0e6a876cf344c0ad8a54882111dd3c5c7ca36"
... ... @@ -4223,6 +4310,12 @@ lodash.clone@^4.3.2:
version "4.5.0"
resolved "http://npm.yoho.cn/lodash.clone/-/lodash.clone-4.5.0.tgz#195870450f5a13192478df4bc3d23d2dea1907b6"
lodash.clone@~4.3.2:
version "4.3.2"
resolved "http://npm.yoho.cn/lodash.clone/-/lodash.clone-4.3.2.tgz#e56b176b6823a7dde38f7f2bf58de7d5971200e9"
dependencies:
lodash._baseclone "~4.5.0"
lodash.clonedeep@^4.3.2:
version "4.5.0"
resolved "http://npm.yoho.cn/lodash.clonedeep/-/lodash.clonedeep-4.5.0.tgz#e23f3f9c4f8fbdde872529c1071857a086e5ccef"
... ... @@ -4529,12 +4622,22 @@ miller-rabin@^4.0.0:
version "1.27.0"
resolved "http://npm.yoho.cn/mime-db/-/mime-db-1.27.0.tgz#820f572296bbd20ec25ed55e5b5de869e5436eb1"
mime-db@~1.30.0:
version "1.30.0"
resolved "http://npm.yoho.cn/mime-db/-/mime-db-1.30.0.tgz#74c643da2dd9d6a45399963465b26d5ca7d71f01"
mime-types@^2.0.1, mime-types@^2.1.12, mime-types@~2.1.11, mime-types@~2.1.15, mime-types@~2.1.7:
version "2.1.15"
resolved "http://npm.yoho.cn/mime-types/-/mime-types-2.1.15.tgz#a4ebf5064094569237b8cf70046776d09fc92aed"
dependencies:
mime-db "~1.27.0"
mime-types@~2.1.17:
version "2.1.17"
resolved "http://npm.yoho.cn/mime-types/-/mime-types-2.1.17.tgz#09d7a393f03e995a79f8af857b70a9e0ab16557a"
dependencies:
mime-db "~1.30.0"
mime@1.3.4, mime@^1.3.4:
version "1.3.4"
resolved "http://npm.yoho.cn/mime/-/mime-1.3.4.tgz#115f9e3b6b3daf2959983cb38f149a2d40eb5d53"
... ... @@ -4939,7 +5042,7 @@ number-is-nan@^1.0.0:
version "1.0.1"
resolved "http://npm.yoho.cn/number-is-nan/-/number-is-nan-1.0.1.tgz#097b602b53422a522c1afb8790318336941a011d"
oauth-sign@~0.8.1:
oauth-sign@~0.8.1, oauth-sign@~0.8.2:
version "0.8.2"
resolved "http://npm.yoho.cn/oauth-sign/-/oauth-sign-0.8.2.tgz#46a6ab7f0aead8deae9ec0565780b7d4efeb9d43"
... ... @@ -5335,6 +5438,10 @@ performance-now@^0.2.0:
version "0.2.0"
resolved "http://npm.yoho.cn/performance-now/-/performance-now-0.2.0.tgz#33ef30c5c77d4ea21c5a53869d91b56d8f2555e5"
performance-now@^2.1.0:
version "2.1.0"
resolved "http://npm.yoho.cn/performance-now/-/performance-now-2.1.0.tgz#6309f4e0e5fa913ec1c69307ae364b4b377c9e7b"
phantomjs-prebuilt@^2.1.14:
version "2.1.14"
resolved "http://npm.yoho.cn/phantomjs-prebuilt/-/phantomjs-prebuilt-2.1.14.tgz#d53d311fcfb7d1d08ddb24014558f1188c516da0"
... ... @@ -6153,6 +6260,10 @@ qs@~6.3.0:
version "6.3.2"
resolved "http://npm.yoho.cn/qs/-/qs-6.3.2.tgz#e75bd5f6e268122a2a0e0bda630b2550c166502c"
qs@~6.5.1:
version "6.5.1"
resolved "http://npm.yoho.cn/qs/-/qs-6.5.1.tgz#349cdf6eef89ec45c12d7d5eb3fc0c870343a6d8"
query-string@^4.1.0:
version "4.3.4"
resolved "http://npm.yoho.cn/query-string/-/query-string-4.3.4.tgz#bbb693b9ca915c232515b228b1a02b609043dbeb"
... ... @@ -6515,6 +6626,33 @@ request@2, request@^2.34, request@^2.44.0, request@^2.79.0, request@^2.81.0:
tunnel-agent "^0.6.0"
uuid "^3.0.0"
request@^2.83.0:
version "2.83.0"
resolved "http://npm.yoho.cn/request/-/request-2.83.0.tgz#ca0b65da02ed62935887808e6f510381034e3356"
dependencies:
aws-sign2 "~0.7.0"
aws4 "^1.6.0"
caseless "~0.12.0"
combined-stream "~1.0.5"
extend "~3.0.1"
forever-agent "~0.6.1"
form-data "~2.3.1"
har-validator "~5.0.3"
hawk "~6.0.2"
http-signature "~1.2.0"
is-typedarray "~1.0.0"
isstream "~0.1.2"
json-stringify-safe "~5.0.1"
mime-types "~2.1.17"
oauth-sign "~0.8.2"
performance-now "^2.1.0"
qs "~6.5.1"
safe-buffer "^5.1.1"
stringstream "~0.0.5"
tough-cookie "~2.3.3"
tunnel-agent "^0.6.0"
uuid "^3.1.0"
request@~2.79.0:
version "2.79.0"
resolved "http://npm.yoho.cn/request/-/request-2.79.0.tgz#4dfe5bf6be8b8cdc37fcf93e04b65577722710de"
... ... @@ -6677,7 +6815,7 @@ safe-buffer@5.0.1, safe-buffer@^5.0.1, safe-buffer@~5.0.1:
version "5.0.1"
resolved "http://npm.yoho.cn/safe-buffer/-/safe-buffer-5.0.1.tgz#d263ca54696cd8a306b5ca6551e92de57918fbe7"
safe-buffer@5.1.1, safe-buffer@^5.1.0, safe-buffer@~5.1.0, safe-buffer@~5.1.1:
safe-buffer@5.1.1, safe-buffer@^5.1.0, safe-buffer@^5.1.1, safe-buffer@~5.1.0, safe-buffer@~5.1.1:
version "5.1.1"
resolved "http://npm.yoho.cn/safe-buffer/-/safe-buffer-5.1.1.tgz#893312af69b2123def71f57889001671eeb2c853"
... ... @@ -6912,6 +7050,12 @@ sntp@1.x.x:
dependencies:
hoek "2.x.x"
sntp@2.x.x:
version "2.1.0"
resolved "http://npm.yoho.cn/sntp/-/sntp-2.1.0.tgz#2c6cec14fedc2222739caf9b5c3d85d1cc5a2cc8"
dependencies:
hoek "4.x.x"
socket.io-adapter@0.5.0:
version "0.5.0"
resolved "http://npm.yoho.cn/socket.io-adapter/-/socket.io-adapter-0.5.0.tgz#cb6d4bb8bec81e1078b99677f9ced0046066bb8b"
... ... @@ -7208,7 +7352,7 @@ string_decoder@~1.0.3:
dependencies:
safe-buffer "~5.1.0"
stringstream@~0.0.4:
stringstream@~0.0.4, stringstream@~0.0.5:
version "0.0.5"
resolved "http://npm.yoho.cn/stringstream/-/stringstream-0.0.5.tgz#4e484cd4de5a0bbbee18e46307710a8a81621878"
... ... @@ -7558,6 +7702,12 @@ tough-cookie@~2.3.0:
dependencies:
punycode "^1.4.1"
tough-cookie@~2.3.3:
version "2.3.3"
resolved "http://npm.yoho.cn/tough-cookie/-/tough-cookie-2.3.3.tgz#0b618a5565b6dea90bf3425d04d55edc475a7561"
dependencies:
punycode "^1.4.1"
trim-newlines@^1.0.0:
version "1.0.0"
resolved "http://npm.yoho.cn/trim-newlines/-/trim-newlines-1.0.0.tgz#5887966bb582a4503a41eb524f7d35011815a613"
... ... @@ -7755,7 +7905,7 @@ uuid@^2.0.1, uuid@^2.0.2:
version "2.0.3"
resolved "http://npm.yoho.cn/uuid/-/uuid-2.0.3.tgz#67e2e863797215530dff318e5bf9dcebfd47b21a"
uuid@^3.0.0, uuid@^3.0.1:
uuid@^3.0.0, uuid@^3.0.1, uuid@^3.1.0:
version "3.1.0"
resolved "http://npm.yoho.cn/uuid/-/uuid-3.1.0.tgz#3dd3d3e790abc24d7b0d3a034ffababe28ebbc04"
... ... @@ -8195,6 +8345,17 @@ winston@^2.2.0, winston@^2.3.1:
isstream "0.1.x"
stack-trace "0.0.x"
winston@^2.4.0:
version "2.4.0"
resolved "http://npm.yoho.cn/winston/-/winston-2.4.0.tgz#808050b93d52661ed9fb6c26b3f0c826708b0aee"
dependencies:
async "~1.0.0"
colors "1.0.x"
cycle "1.0.x"
eyes "0.1.x"
isstream "0.1.x"
stack-trace "0.0.x"
wordwrap@0.0.2:
version "0.0.2"
resolved "http://npm.yoho.cn/wordwrap/-/wordwrap-0.0.2.tgz#b79669bb42ecb409f83d583cad52ca17eaa1643f"
... ... @@ -8412,12 +8573,13 @@ yoho-md5@^2.0.0:
version "2.0.0"
resolved "http://npm.yoho.cn/yoho-md5/-/yoho-md5-2.0.0.tgz#e801a5cce8e08f5d7211e9a2e789ea7275eb9332"
yoho-node-lib@=0.5.6:
version "0.5.6"
resolved "http://npm.yoho.cn/yoho-node-lib/-/yoho-node-lib-0.5.6.tgz#bec1a0924252e79dda191a644c4f28008e70bd0a"
yoho-node-lib@=0.5.21:
version "0.5.21"
resolved "http://npm.yoho.cn/yoho-node-lib/-/yoho-node-lib-0.5.21.tgz#4977a4d9c3da60f08ba17b57a6abe8fab037ccbb"
dependencies:
dnscache "^1.0.1"
handlebars "^4.0.5"
influx-batch-sender "^0.1.3"
influx-batch-sender "^0.1.4"
lodash "^4.13.1"
lru-cache "^4.1.1"
md5 "^2.1.0"
... ... @@ -8427,7 +8589,7 @@ yoho-node-lib@=0.5.6:
request "^2.81.0"
uuid "^3.0.1"
walk "^2.3.9"
winston "^2.2.0"
winston "^2.4.0"
winston-daily-rotate-file "^1.1.1"
xss-filters "^1.2.6"
... ...