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

🐞 fix(录像): 修复录像存储以及读取路径

Browse Source
This commit is contained in:
luying
2023-04-20 10:59:27 +08:00
parent cc909dd633
commit 66c7e272e2
7 changed files with 13 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
game-server/app/servers/battle/handler/ladderHandler.ts
View File

@@ -361,7 +361,7 @@ export class LadderHandler {
return resResult(STATUS.SUCCESS, { return resResult(STATUS.SUCCESS, {
list: list.map(rec => { list: list.map(rec => {
const { roleId1, battleCode, hasRpl, remoteUrl } = rec; const { roleId1, battleCode, hasRpl, remoteUrl } = rec;
const rplFileUrl = battleCode && hasRpl ? getRemoteRplFilePath(remoteUrl, roleId1, WAR_TYPE.LADDER, battleCode) : ''; const rplFileUrl = battleCode && hasRpl ? remoteUrl : '';
return { ...rec, rplFileUrl }; return { ...rec, rplFileUrl };
}), }),
rplPrefixUrl: getRemoteRplPrefix(pinus.app.get('env')) rplPrefixUrl: getRemoteRplPrefix(pinus.app.get('env'))

2
game-server/app/servers/battle/handler/pvpHandler.ts
View File

@@ -619,7 +619,7 @@ export class PvpHandler {
return resResult(STATUS.SUCCESS, { return resResult(STATUS.SUCCESS, {
list: pvpRecords.map(rec => { list: pvpRecords.map(rec => {
const { roleId1, battleCode, hasRpl, remoteUrl } = rec; const { roleId1, battleCode, hasRpl, remoteUrl } = rec;
const rplFileUrl = battleCode && hasRpl ? getRemoteRplFilePath(remoteUrl, roleId1, WAR_TYPE.PVP, battleCode) : ''; const rplFileUrl = battleCode && hasRpl ? remoteUrl : '';
return { ...rec, rplFileUrl }; return { ...rec, rplFileUrl };
}), }),
rplPrefixUrl: getRemoteRplPrefix(pinus.app.get('env')) rplPrefixUrl: getRemoteRplPrefix(pinus.app.get('env'))

2
game-server/app/servers/guild/handler/gvgFightHandler.ts
View File

@@ -396,7 +396,7 @@ export class GVGProduceHandler {
let result: (GVGVestigeRecUpdate & {rplFileUrl: string})[] = []; let result: (GVGVestigeRecUpdate & {rplFileUrl: string})[] = [];
for(let rec of list) { for(let rec of list) {
const { attackRoleId, battleCode, hasRpl, remoteUrl } = rec; const { attackRoleId, battleCode, hasRpl, remoteUrl } = rec;
const rplFileUrl = battleCode && hasRpl ? getRemoteRplFilePath(remoteUrl, attackRoleId, WAR_TYPE.GVG_VESTIGE, battleCode) : ''; const rplFileUrl = battleCode && hasRpl ? remoteUrl : '';
const obj = getVestigeRecStatus(rec); const obj = getVestigeRecStatus(rec);
if(obj.status == VESTIGE_STATUS.COMPLETE) result.push({ ...rec, endTime: obj.time, rplFileUrl }); if(obj.status == VESTIGE_STATUS.COMPLETE) result.push({ ...rec, endTime: obj.time, rplFileUrl });
} }

2
shared/db/GVGVestigeRec.ts
View File

@@ -122,7 +122,7 @@ export default class GVGVestigeRec extends BaseModel {
let recs: GVGVestigeRecType[] = await GVGVestigeRecModel.find({ let recs: GVGVestigeRecType[] = await GVGVestigeRecModel.find({
vestigeId, $or: [{attackRoleId: roleId}, { defenseRoleId: roleId }], vestigeId, $or: [{attackRoleId: roleId}, { defenseRoleId: roleId }],
createdAt: { $gte: <Date>getTimeFunD().getBeforeDayWithHour(3) }, createdAt: { $gte: <Date>getTimeFunD().getBeforeDayWithHour(3) },
}).select({ battleCode: 1, attackRoleId: 1, defenseRoleId: 1, _id: 0, endTime: 1, attackInfo: 1, defenseInfo: 1, hasRpl: 1 }).limit(1000).lean(); }).select({ battleCode: 1, attackRoleId: 1, defenseRoleId: 1, _id: 0, endTime: 1, attackInfo: 1, defenseInfo: 1, hasRpl: 1, remoteUrl: 1 }).limit(1000).lean();
return recs; return recs;
} }
} }

2
shared/db/LadderMatchRec.ts
View File

@@ -118,7 +118,7 @@ export default class LadderMatchRec extends BaseModel {
endTime: { $gt: startMs }, endTime: { $gt: startMs },
$or: [{roleId1: roleId}, { roleId2: roleId }], $or: [{roleId1: roleId}, { roleId2: roleId }],
status: LADDER_STATUS.COMPLETE status: LADDER_STATUS.COMPLETE
}).select({ battleCode: 1, roleId1: 1, roleId2: 1, _id: -1, endTime: 1, attackInfo: 1, defenseInfo: 1, hasRpl: 1 }).limit(1000).lean(); }).select({ battleCode: 1, roleId1: 1, roleId2: 1, _id: -1, endTime: 1, attackInfo: 1, defenseInfo: 1, hasRpl: 1, remoteUrl: 1 }).limit(1000).lean();
return recs; return recs;
} }

6
shared/pubUtils/battleUtils.ts
View File

@@ -37,14 +37,14 @@ export function getLocalRplUrl(roleId: string, warType: number, battleCode: stri
return writePath; return writePath;
} }
export function getRemoteRplUrl(env: string, sshHost: string, roleId: string, warType: number, battleCode: string) { export function getRemoteRplUrl(sshHost: string, roleId: string, warType: number, battleCode: string) {
const battleClass = modStr(battleCode, BATTLE_CLASS_MOD); // 将存档文件按一定规则分批保存 const battleClass = modStr(battleCode, BATTLE_CLASS_MOD); // 将存档文件按一定规则分批保存
const rplUrl = `${getPrefixByEnv(env)}/rpls/${md5(sshHost).substring(0, 4)}/${roleId}/${warType}/${battleClass}`; const rplUrl = `/${md5(sshHost).substring(0, 4)}/${roleId}/${warType}/${battleClass}`;
return rplUrl; return rplUrl;
} }
export function getRemoteRplPrefix(env: string) { export function getRemoteRplPrefix(env: string) {
const rplUrl = `${getPrefixByEnv(env)}/rpls/${md5(env).substring(0, 4)}`; const rplUrl = `${getPrefixByEnv(env)}/rpls/`;
return rplUrl; return rplUrl;
} }

9
web-server/app/controller/game.ts
View File

@@ -15,7 +15,7 @@ import { RedisClient } from 'redis';
import { REDIS_KEY } from '@consts'; import { REDIS_KEY } from '@consts';
import { RegionModel } from '@db/Region'; import { RegionModel } from '@db/Region';
import { getRandEelmWithWeight } from 'app/pubUtils/util'; import { getRandEelmWithWeight } from 'app/pubUtils/util';
import { getLocalRplUrl, getRemoteRplUrl } from 'app/pubUtils/battleUtils' import { getLocalRplUrl, getRemoteRplUrl, getRemoteRplPrefix } from 'app/pubUtils/battleUtils'
import { ChannelInfoModel } from '@db/ChannelInfo'; import { ChannelInfoModel } from '@db/ChannelInfo';
import { GVGVestigeRecModel } from '@db/GVGVestigeRec'; import { GVGVestigeRecModel } from '@db/GVGVestigeRec';
import { GVGBattleRecModel } from '@db/GVGBattleRec'; import { GVGBattleRecModel } from '@db/GVGBattleRec';
@@ -202,7 +202,7 @@ export default class GameController extends Controller {
const { ctx } = this; const { ctx } = this;
const parts = ctx.multipart(); const parts = ctx.multipart();
let part; let part;
let [writePath, token, battleCode, fullPath, remoteUrl, warType] = ['', '', '', '', '', 0]; let [writePath, token, battleCode, fullPath, remoteUrl, warType, prefix] = ['', '', '', '', '', 0, ''];
while ((part = await parts()) != null) { while ((part = await parts()) != null) {
if (part.length) { if (part.length) {
console.log('kv: ', `${part[0]}: ${part[1]}`); console.log('kv: ', `${part[0]}: ${part[1]}`);
@@ -267,7 +267,8 @@ export default class GameController extends Controller {
const writeStream = fs.createWriteStream(fullPath); const writeStream = fs.createWriteStream(fullPath);
await pump(part, writeStream); await pump(part, writeStream);
remoteUrl = `${getRemoteRplUrl(ctx.app.config.realEnv, ctx.app.config.sshHost,roleId, warType, battleCode)}/${battleCode}.bin`; prefix = getRemoteRplPrefix(ctx.app.config.realEnv);
remoteUrl = `${getRemoteRplUrl(ctx.app.config.sshHost,roleId, warType, battleCode)}/${battleCode}.bin`;
let updateDBRes; let updateDBRes;
if (warType === WAR_TYPE.PVP) { if (warType === WAR_TYPE.PVP) {
updateDBRes = await PvpRecordModel.updateRplStatus(battleCode, true, remoteUrl); updateDBRes = await PvpRecordModel.updateRplStatus(battleCode, true, remoteUrl);
@@ -284,7 +285,7 @@ export default class GameController extends Controller {
} }
} }
} }
ctx.body = ctx.service.utils.resResult(STATUS.SUCCESS, { rplUrl: remoteUrl }); ctx.body = ctx.service.utils.resResult(STATUS.SUCCESS, { rplUrl: prefix + remoteUrl });
return; return;
} }