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
shared/db/GVGVestigeRec.ts
View File

@@ -122,7 +122,7 @@ export default class GVGVestigeRec extends BaseModel {
let recs: GVGVestigeRecType[] = await GVGVestigeRecModel.find({
vestigeId, $or: [{attackRoleId: roleId}, { defenseRoleId: roleId }],
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;
}
}

2
shared/db/LadderMatchRec.ts
View File

@@ -118,7 +118,7 @@ export default class LadderMatchRec extends BaseModel {
endTime: { $gt: startMs },
$or: [{roleId1: roleId}, { roleId2: roleId }],
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;
}

6
shared/pubUtils/battleUtils.ts
View File

@@ -37,14 +37,14 @@ export function getLocalRplUrl(roleId: string, warType: number, battleCode: stri
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 rplUrl = `${getPrefixByEnv(env)}/rpls/${md5(sshHost).substring(0, 4)}/${roleId}/${warType}/${battleClass}`;
const rplUrl = `/${md5(sshHost).substring(0, 4)}/${roleId}/${warType}/${battleClass}`;
return rplUrl;
}
export function getRemoteRplPrefix(env: string) {
const rplUrl = `${getPrefixByEnv(env)}/rpls/${md5(env).substring(0, 4)}`;
const rplUrl = `${getPrefixByEnv(env)}/rpls/`;
return rplUrl;
}