diff --git a/ecosystem.config.js b/ecosystem.config.js index cbd6c2c..dbc57e3 100644 --- a/ecosystem.config.js +++ b/ecosystem.config.js @@ -9,8 +9,9 @@ module.exports = { instances : 1, exec_mode : 'cluster', log_date_format: "YYYY-MM-DD HH:mm:ss", - error_file : '/data/logs/card_info_svr/error/error.log', // error日志路径 - out_file : '/data/logs/card_info_svr/out/info.log', // out日志路径, + error_file : '/data/logs/card_info/error/error.log', // error日志路径 + out_file : '/data/logs/card_info/out/info.log', // out日志路径, + cwd : '/data/apps/card_info', env: { PORT: 2987, DEBUG: "jc:*", diff --git a/package.json b/package.json index e062506..5b3d443 100644 --- a/package.json +++ b/package.json @@ -5,6 +5,7 @@ "main": "index.js", "scripts": { "dev:api": "DEBUG=colyseus:*,jc:* ts-node -r tsconfig-paths/register src/api.ts", + "prod:api": "NODE_ENV=production,DEBUG=colyseus:*,jc:* ts-node -r tsconfig-paths/register src/api.ts", "win": "$env:DEBUG='jc:*';node --require ts-node/register --inspect src/api.ts", "debug": "node --require ts-node/register --inspect src/api.ts" }, diff --git a/src/controllers/ActivityController.ts b/src/controllers/ActivityController.ts index b4bf738..6861ac0 100644 --- a/src/controllers/ActivityController.ts +++ b/src/controllers/ActivityController.ts @@ -43,13 +43,25 @@ export default class ActivityController extends BaseController { } record.count += 1 rest = cfg.frequency - record.count - if (cfg.id == 90003 && record.count == 1) { - cfg = cfgMap.get(90004) - } rest = rest <= 0 ? 0 : rest record.lasttime = Date.now() + let arr0 = cfg.income.split('|') + let itemStr + for (let str of arr0) { + let arr1 = str.split(':') + let maxCount = 1 + if (arr1.length >= 3) { + maxCount = parseInt(arr1[2]) + } + if (record.count >= maxCount) { + itemStr = `${arr1[0]}:${arr1[1]}` + } + } + if (!itemStr) { + throw new ZError(15, 'cfg error') + } await record.save() - const itemInfos: ItemInfo[] = ItemCtrl.getItemsByInfo(cfg.income) + const itemInfos: ItemInfo[] = ItemCtrl.getItemsByInfo(itemStr) let results if (id == 90001 || id == 90002) { const account = req.user @@ -59,7 +71,6 @@ export default class ActivityController extends BaseController { await BagItem.addItems(accountid, itemInfos) results = itemInfos } - await record.save() return { items: results, rest