Authored by 李奇

Merge branch 'release/6.7.9' into feature/wheel-surf

... ... @@ -31,7 +31,7 @@ app.locals.isProduction = app.get('env') === 'production';
app.locals.version = pkg.version;
app.locals.startTime = moment().format('YYYYMMDDHH');
// config.yohoVerifyUdid = '864176038332691e8c939b2d33d0708'; // 临时用于红包雨的udid
// config.yohoVerifyUdid = '1a61c0b4db7b6e27999b1237977b5347eb503956'; // 临时用于红包雨的udid
// 全局注册library
ynLib.global(config);
... ...
... ... @@ -134,10 +134,10 @@ const redpac = {
if (result && result.data) {
sendMessage(0, {}, {succeedTimes: result.data.amount || 0}, 0);
} else {
sendMessage(0, {}, {message: result.message || 'no result', stack: Object.assign({}, {code: result.code})}, 1);
sendMessage(0, {}, {succeedTimes: result.data.amount || 0}, 0);
}
return res.json(result);
return res.json(result || {});
}).catch(e => {
console.log('error:', e);
sendMessage(0, {}, {message: e.message || 'interface error', stack: e}, 1);
... ...
... ... @@ -57,7 +57,7 @@ module.exports = {
loggers: {
infoFile: {
name: 'info',
level: 'debug',
level: 'info',
filename: '/Data/log/yoho-activity-platform/info.log',
maxFiles: 7
},
... ...