xinyuxi/ZYZ
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

日志：短链接记录

Browse Source
This commit is contained in:
luying
2021-07-27 16:56:57 +08:00
parent ff36c4b361
commit 7bc4ff4577
20 changed files with 244 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
game-server/app/services/equipService.ts
View File

@@ -42,7 +42,6 @@ export function checkMaterialEnough(consumes: Array<{ id: number, count: number
jewelInfo = getJewelById(jewelInfo.nextJewelId);
}
}
console.log('*******', JSON.stringify(needConsumes));
if (comJewelMap[jewel] != jewelCount || Object.keys(comJewelMap).length != 1)//检查最终是否可以合成目标宝石jewel，以及对应的数量jewelCount
return false;
return needConsumes;

20
gm-server/app/middleware/log.ts Normal file
View File

@@ -0,0 +1,20 @@
import { genCode } from "@pubUtils/util";
module.exports = () => {
return async function log(ctx, next) {
ctx.logcode = genCode(10);
ctx.service.utils.log('INFO', `[${ctx.request.url}] [${ctx.logcode}] request: ${JSON.stringify(ctx.request.body)}`)
try{
await next();
} catch(e) {
ctx.service.utils.log('ERROR', `[${ctx.request.url}] [${ctx.logcode}] err: ${e.stack}`);
throw e;
}
const resBody = ctx.body;
ctx.service.utils.log('INFO', `[${ctx.request.url}] [${ctx.logcode}] res: ${JSON.stringify(resBody)}`)
};
};

14
gm-server/app/service/Utils.ts
View File

@@ -36,4 +36,18 @@ export default class Utils extends Service {
public checkActivityData(data: any, type: number) {
return { data, type }
}
public log(level: 'DEBUG'|'INFO'|'WARN'| 'ERROR', message: string) {
const log = this.app.loggers.get('linkLogger');
if(level == 'DEBUG') {
log.error(`${message}`);
} else if (level == 'INFO') {
log.info(`${message}`);
} else if (level == 'WARN') {
log.warn(`${message}`);
} else if (level == "ERROR") {
log.error(`${message}`);
}
}
}

19
gm-server/config/config.default.ts
View File

@@ -1,4 +1,5 @@
import { EggAppConfig, EggAppInfo, PowerPartial } from 'egg';
const path = require('path');
export default (appInfo: EggAppInfo) => {
const config = {} as PowerPartial<EggAppConfig>;
@@ -8,7 +9,7 @@ export default (appInfo: EggAppInfo) => {
config.keys = appInfo.name + '_1600244957952_7142';
// add your egg config in here
config.middleware = [];
config.middleware = ['log'];
config.cluster = {
listen: {
@@ -47,6 +48,22 @@ export default (appInfo: EggAppInfo) => {
packages: [ '/root/zyz/web-server/package.json' ],
};
config.customLogger = {
linkLogger: {
file: path.join(appInfo.root, 'logs/gm-server/link-log.log'),
formatter(meta) {
return `[${meta.level}] [${meta.date}] ${meta.message}`;
},
},
};
config.logrotator = {
filesRotateBySize: [
path.join(appInfo.root, 'logs/link-log.log'),
],
maxFileSize: 1024,
};
// the return config will combines to EggAppConfig
return {
...config,

19
gm-server/config/config.dev.ts
View File

@@ -1,4 +1,5 @@
import { EggAppConfig, EggAppInfo, PowerPartial } from 'egg';
const path = require('path');
export default (appInfo: EggAppInfo) => {
const config = {} as PowerPartial<EggAppConfig>;
@@ -8,7 +9,7 @@ export default (appInfo: EggAppInfo) => {
config.keys = appInfo.name + '_1600244957952_7142';
// add your egg config in here
config.middleware = [];
config.middleware = ['log'];
config.cluster = {
listen: {
@@ -51,6 +52,22 @@ export default (appInfo: EggAppInfo) => {
packages: [ '/root/zyz/web-server/package.json' ],
};
config.customLogger = {
linkLogger: {
file: path.join(appInfo.root, 'logs/gm-server/link-log.log'),
formatter(meta) {
return `[${meta.level}] [${meta.date}] ${meta.message}`;
},
},
};
config.logrotator = {
filesRotateBySize: [
path.join(appInfo.root, 'logs/link-log.log'),
],
maxFileSize: 1024,
};
// the return config will combines to EggAppConfig
return {
...config,

19
gm-server/config/config.isbn.ts
View File

@@ -1,4 +1,5 @@
import { EggAppConfig, EggAppInfo, PowerPartial } from 'egg';
const path = require('path');
export default (appInfo: EggAppInfo) => {
const config = {} as PowerPartial<EggAppConfig>;
@@ -8,7 +9,7 @@ export default (appInfo: EggAppInfo) => {
config.keys = appInfo.name + '_1600244957952_7142';
// add your egg config in here
config.middleware = [];
config.middleware = ['log'];
config.cluster = {
listen: {
@@ -47,6 +48,22 @@ export default (appInfo: EggAppInfo) => {
packages: [ '/root/zyz/web-server/package.json' ],
};
config.customLogger = {
linkLogger: {
file: path.join(appInfo.root, 'logs/gm-server/link-log.log'),
formatter(meta) {
return `[${meta.level}] [${meta.date}] ${meta.message}`;
},
},
};
config.logrotator = {
filesRotateBySize: [
path.join(appInfo.root, 'logs/link-log.log'),
],
maxFileSize: 1024,
};
// the return config will combines to EggAppConfig
return {
...config,

19
gm-server/config/config.local.ts
View File

@@ -1,4 +1,5 @@
import { EggAppConfig, EggAppInfo, PowerPartial } from 'egg';
const path = require('path');
export default (appInfo: EggAppInfo) => {
const config = {} as PowerPartial<EggAppConfig>;
@@ -8,7 +9,7 @@ export default (appInfo: EggAppInfo) => {
config.keys = appInfo.name + '_1600244957952_7142';
// add your egg config in here
config.middleware = [];
config.middleware = ['log'];
config.cluster = {
listen: {
@@ -51,6 +52,22 @@ export default (appInfo: EggAppInfo) => {
packages: [ '/root/zyz/web-server/package.json' ],
};
config.customLogger = {
linkLogger: {
file: path.join(appInfo.root, 'logs/gm-server/link-log.log'),
formatter(meta) {
return `[${meta.level}] [${meta.date}] ${meta.message}`;
},
},
};
config.logrotator = {
filesRotateBySize: [
path.join(appInfo.root, 'logs/link-log.log'),
],
maxFileSize: 1024,
};
// the return config will combines to EggAppConfig
return {
...config,

19
gm-server/config/config.monitor.ts
View File

@@ -1,4 +1,5 @@
import { EggAppConfig, EggAppInfo, PowerPartial } from 'egg';
const path = require('path');
export default (appInfo: EggAppInfo) => {
const config = {} as PowerPartial<EggAppConfig>;
@@ -8,7 +9,7 @@ export default (appInfo: EggAppInfo) => {
config.keys = appInfo.name + '_1600244957952_7142';
// add your egg config in here
config.middleware = [];
config.middleware = ['log'];
config.cluster = {
listen: {
@@ -47,6 +48,22 @@ export default (appInfo: EggAppInfo) => {
packages: [ '/root/zyz/web-server/package.json' ],
};
config.customLogger = {
linkLogger: {
file: path.join(appInfo.root, 'logs/gm-server/link-log.log'),
formatter(meta) {
return `[${meta.level}] [${meta.date}] ${meta.message}`;
},
},
};
config.logrotator = {
filesRotateBySize: [
path.join(appInfo.root, 'logs/link-log.log'),
],
maxFileSize: 1024,
};
// the return config will combines to EggAppConfig
return {
...config,

2
gm-server/typings/app/middleware/index.d.ts vendored
View File

@@ -2,10 +2,12 @@
// Do not modify this file!!!!!!!!!
import 'egg';
import ExportLog from '../../../app/middleware/log';
import ExportTokenParser from '../../../app/middleware/tokenParser';
declare module 'egg' {
interface IMiddleware {
log: typeof ExportLog;
tokenParser: typeof ExportTokenParser;
}
}

2
package.json
View File

@@ -15,10 +15,10 @@
"mongoose-lean-getters": "^0.1.2",
"mongoose-lean-virtuals": "^0.7.6",
"mongoose-transactions": "^1.1.4",
"request": "^2.88.2",
"request-promise": "^4.2.6",
"underscore": "^1.12.0"
},
"devDependencies": {},
"scripts": {
"test": "echo \"Error: no test specified\" && exit 1"
},

14
web-server/app/middleware/parmsDecode.ts
View File

@@ -1,4 +1,5 @@
import { ENCRYPT_KEY, ENCRYPT_IV } from '@consts';
import { genCode } from 'app/pubUtils/util';
import { Context } from 'egg';
const crypto = require('crypto');
const isJSON = require('koa-is-json');
@@ -21,6 +22,7 @@ module.exports = options => {
return async function parmsDecode(ctx: Context, next) {
let m = ctx.request.url.indexOf("/dev");
let n = ctx.request.url.indexOf("/web");
ctx.logcode = genCode(10);
if(m == 0 || n == 0) {
await next();
return;
@@ -47,17 +49,27 @@ module.exports = options => {
try {
ctx.request.body = JSON.parse(decodeStr);
console.log('req body', ctx.request.body);
ctx.service.utils.log('INFO', `[${ctx.request.url}] [${ctx.logcode}] request: ${JSON.stringify(ctx.request.body)}`)
} catch (e) {
console.error('parms parse err');
ctx.service.utils.log('ERROR', `[${ctx.request.url}] [${ctx.logcode}] request: parms parse err`)
}
await next();
try{
await next();
} catch(e) {
ctx.service.utils.log('ERROR', `[${ctx.request.url}] [${ctx.logcode}] err: ${e.stack}`);
throw e;
}
const resBody = ctx.body;
console.log('return value:', JSON.stringify(resBody));
if (isJSON(resBody)) {
ctx.body = { result: aesEncrypt(JSON.stringify(resBody), ENCRYPT_KEY, ENCRYPT_IV) };
ctx.service.utils.log('INFO', `[${ctx.request.url}] [${ctx.logcode}] res: ${JSON.stringify(resBody)}`)
} else {
ctx.body = { result: aesEncrypt(JSON.stringify({ status: 3, data: 'internal err' }), ENCRYPT_KEY, ENCRYPT_IV) };
ctx.service.utils.log('ERROR', `[${ctx.request.url}] [${ctx.logcode}] res: ${resBody}`)
}
};
};

2
web-server/app/middleware/tokenParser.ts
View File

@@ -20,6 +20,8 @@ module.exports = () => {
ctx.userCode = user.userCode;
ctx.pkgName = user.pkgName;
ctx.tel = user.tel;
ctx.service.utils.log('INFO', `[${ctx.request.url}] [${ctx.logcode}] user: ${user.uid}`);
await next();
};
};

14
web-server/app/service/Utils.ts
View File

@@ -54,4 +54,18 @@ export default class Utils extends Service {
public unlockFigure(roleId: string, conditions: {type: number, paramHid?: number, paramFavourLv?: number, paramSkinId?: number}[], role?: RoleType) {
return unlockFigure(roleId, conditions, role);
}
public log(level: 'DEBUG'|'INFO'|'WARN'| 'ERROR', message: string) {
const log = this.app.loggers.get('linkLogger');
if(level == 'DEBUG') {
log.error(`${message}`);
} else if (level == 'INFO') {
log.info(`${message}`);
} else if (level == 'WARN') {
log.warn(`${message}`);
} else if (level == "ERROR") {
log.error(`${message}`);
}
}
}

14
web-server/config/config.alpha.ts
View File

@@ -47,7 +47,21 @@ export default (appInfo: EggAppInfo) => {
dir: path.join(appInfo.baseDir, '/app/public'),
};
config.customLogger = {
linkLogger: {
file: path.join(appInfo.root, 'logs/web-server/link-log.log'),
formatter(meta) {
return `[${meta.level}] [${meta.date}] ${meta.message}`;
},
},
};
config.logrotator = {
filesRotateBySize: [
path.join(appInfo.root, 'logs/link-log.log'),
],
maxFileSize: 1024,
};
// add your special config in here
const bizConfig = {
sourceUrl: `https://github.com/eggjs/examples/tree/master/${appInfo.name}`,

15
web-server/config/config.default.ts
View File

@@ -53,7 +53,22 @@ export default (appInfo: EggAppInfo) => {
appSecret: 'a48ad5ca44e2d02cbd7f4c0326fa3101',
error_log: [ '/root/logs/zyz/zyz-web.log', '/root/logs/zyz/common-error.log', '/root/logs/zyz/egg-agent.log' ],
};
config.customLogger = {
linkLogger: {
file: path.join(appInfo.root, 'logs/web-server/link-log.log'),
formatter(meta) {
return `[${meta.level}] [${meta.date}] ${meta.message}`;
},
},
};
config.logrotator = {
filesRotateBySize: [
path.join(appInfo.root, 'logs/link-log.log'),
],
maxFileSize: 1024,
};
// add your special config in here
const bizConfig = {
sourceUrl: `https://github.com/eggjs/examples/tree/master/${appInfo.name}`,

14
web-server/config/config.dev.ts
View File

@@ -46,7 +46,21 @@ export default (appInfo: EggAppInfo) => {
prefix: '/',
dir: path.join(appInfo.baseDir, '/app/public'),
};
config.customLogger = {
linkLogger: {
file: path.join(appInfo.root, 'logs/web-server/link-log.log'),
formatter(meta) {
return `[${meta.level}] [${meta.date}] ${meta.message}`;
},
},
};
config.logrotator = {
filesRotateBySize: [
path.join(appInfo.root, 'logs/link-log.log'),
],
maxFileSize: 1024,
};
// add your special config in here
const bizConfig = {

14
web-server/config/config.isbn.ts
View File

@@ -47,7 +47,21 @@ export default (appInfo: EggAppInfo) => {
dir: path.join(appInfo.baseDir, '/app/public'),
};
config.customLogger = {
linkLogger: {
file: path.join(appInfo.root, 'logs/web-server/link-log.log'),
formatter(meta) {
return `[${meta.level}] [${meta.date}] ${meta.message}`;
},
},
};
config.logrotator = {
filesRotateBySize: [
path.join(appInfo.root, 'logs/link-log.log'),
],
maxFileSize: 1024,
};
// add your special config in here
const bizConfig = {
sourceUrl: `https://github.com/eggjs/examples/tree/master/${appInfo.name}`,

17
web-server/config/config.local.ts
View File

@@ -40,13 +40,28 @@ export default (appInfo: EggAppInfo) => {
},
};
config.decodeParm = false;
config.decodeParm = true;
config.static = {
prefix: '/',
dir: path.join(appInfo.baseDir, '/app/public'),
};
config.customLogger = {
linkLogger: {
file: path.join(appInfo.root, 'logs/web-server/link-log.log'),
formatter(meta) {
return `[${meta.level}] [${meta.date}] ${meta.message}`;
},
},
};
config.logrotator = {
filesRotateBySize: [
path.join(appInfo.root, 'logs/link-log.log'),
],
maxFileSize: 1024,
};
// add your special config in here
const bizConfig = {

14
web-server/config/config.monitor.ts
View File

@@ -47,7 +47,21 @@ export default (appInfo: EggAppInfo) => {
dir: path.join(appInfo.baseDir, '/app/public'),
};
config.customLogger = {
linkLogger: {
file: path.join(appInfo.root, 'logs/web-server/link-log.log'),
formatter(meta) {
return `[${meta.level}] [${meta.date}] ${meta.message}`;
},
},
};
config.logrotator = {
filesRotateBySize: [
path.join(appInfo.root, 'logs/link-log.log'),
],
maxFileSize: 1024,
};
// add your special config in here
const bizConfig = {
sourceUrl: `https://github.com/eggjs/examples/tree/master/${appInfo.name}`,

1
web-server/package.json
View File

@@ -34,6 +34,7 @@
"egg-scripts": "^2.6.0",
"egg-view-nunjucks": "^2.2.0",
"egg-xtransit": "^1.2.2",
"moment": "^2.29.1",
"mongoose-transactions": "^1.1.4",
"reflect-metadata": "^0.1.13",
"request": "^2.88.2",