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-01-26 16:55:04 +08:00
parent fb56dd00ec
commit 02b21f27e0
7 changed files with 93 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
game-server/app/services/guildService.ts
+37 -8
View File
@@ -1,7 +1,7 @@
import { gameData, getGuildActiveWeekReward, getGuildActiveByIdAndType } from "../pubUtils/data";
import { GuildModel, GuildType } from "../db/Guild";
import { resResult, shouldRefreshWeek, shouldRefresh } from "../pubUtils/util";
import { STATUS, GUILD_OPERATE, MAIL_TYPE, GUILD_AUTH, GUILD_JOB, REDIS_KEY, } from "../consts";
import { resResult, shouldRefresh } from "../pubUtils/util";
import { STATUS, MAIL_TYPE, GUILD_AUTH, GUILD_JOB, REDIS_KEY, GUILD_DATA_NAME, } from "../consts";
import { RoleModel, RoleType } from "../db/Role";
import { UserGuildModel, UserGuildType } from "../db/UserGuild";
import { UserGuildApplyModel } from "../db/UserGuildApply";
@@ -13,6 +13,8 @@ import { ARMY } from "../pubUtils/dicParam";
import { sendMail } from "./mailService";
import { setRank, getMyRank, initSingleRank } from "./redisService";
import { GuildRankParam, GuildLeader } from "../pubUtils/interface";
import { lockData, isLocked } from '../services/redLockService';
import { ErrLogModel } from '../db/ErrLog';
/**
* @description 检查该玩家是否有权限做操作
@@ -22,7 +24,7 @@ import { GuildRankParam, GuildLeader } from "../pubUtils/interface";
export async function checkAuth(func: number, roleId: string, code?: string, userGuild?: UserGuildType) {
const auth = await UserGuildModel.getMyAuth(roleId, code, userGuild);
const dicGuildAuth = gameData.guildAuth.get(func);
console.log(auth, dicGuildAuth)
// console.log(auth, dicGuildAuth)
if(!dicGuildAuth) return false;
return dicGuildAuth.includes(auth);
@@ -36,44 +38,60 @@ export async function checkAuth(func: number, roleId: string, code?: string, use
*/
export async function joinGuild(code: string, lv: number, roleId: string, serverId: number) {
// TODO 加redlock
// 周结算锁
let isWeeklySum = await isLocked(serverId, GUILD_DATA_NAME.WEEKLY_GUILD_SUM, code);
if(isWeeklySum) return { status: 0, resResult: resResult(STATUS.GUILD_WEEKLY_SUM) };
// 人数锁
let res:any = await lockData(serverId, GUILD_DATA_NAME.JOIN_GUILD, code);// 加锁
if (!!res.err) return { status: 0, resResult: resResult(STATUS.REDLOCK_ERR) };
const result = await RoleModel.joinGuild(roleId);
if(!result) {
res.releaseCallback();//解锁
return { status: 0, resResult: resResult(STATUS.GUILD_HAS_JOIN) };
}
const dicCenterBase = gameData.centerBase.get(lv);
if(!dicCenterBase) {
res.releaseCallback();//解锁
return { status: 0, resResult: resResult(STATUS.DIC_DATA_NOT_FOUND) };
}
const maxMemberCnt = dicCenterBase.peopleNum;
const guild = await GuildModel.addGuild(code, roleId, maxMemberCnt, serverId, result.ce);
if(!guild) {
res.releaseCallback();//解锁
return { status: 0, resResult: resResult(STATUS.GUILD_MEMBER_MAX) };
}
const role = await RoleModel.findByRoleId(roleId);
const userGuild = await UserGuildModel.createUserGuild(guild.code, role, false);
if(!userGuild) {
res.releaseCallback();//解锁
return { status: 0, resResult: resResult(STATUS.GUILD_CREATE_ERROR) };
}
await UserGuildApplyModel.deleteApply(roleId); // 删除玩家所有对其他公会的申请
res.releaseCallback();//解锁
return { status: 1, guild, userGuild, roleName: role.roleName, memberCnt: guild.memberCnt }
}
/**
* 刷新军团活跃
* 刷新军团日活跃
* @param guildCode 军团唯一code
* @param serverId 区
*/
export async function getGuildWithRefActive(guildCode: string, serverId: number) {
// TODO 加写锁
let res:any = await lockData(serverId, GUILD_DATA_NAME.REFRESH_ACTIVE, guildCode);// 加锁
if (!!res.err) return false;
let guild = await GuildModel.findByCode(guildCode, serverId, '+refTimeDaily');
if(!guild) return false;
if(!guild) {
res.releaseCallback();//解锁
return false;
}
console.log(JSON.stringify(guild));
const now = new Date();
@@ -84,6 +102,7 @@ export async function getGuildWithRefActive(guildCode: string, serverId: number)
activeDaily = 0; refTimeDaily = now;
guild = await GuildModel.updateInfo(guildCode, { activeDaily, refTimeDaily }, {});
}
res.releaseCallback();//解锁
return guild;
}
@@ -113,6 +132,10 @@ export async function addActive(roleId: string, serverId: number, id: number, ty
let guild = await getGuildWithRefActive(guildCode, serverId);
if(!guild) return { status: 0, resResult: resResult(STATUS.GUILD_NOT_FOUND) };
// 周结算锁
let isWeeklySum = await isLocked(serverId, GUILD_DATA_NAME.WEEKLY_GUILD_SUM, guildCode);
if(isWeeklySum) return { status: 0, resResult: resResult(STATUS.GUILD_WEEKLY_SUM) };
let {activeRecord} = userGuild;
if(id != 0) { // 用于debug，传0时直接增加活跃
let curActiveRecord = activeRecord.find(cur => cur.id == id);
@@ -168,7 +191,12 @@ export async function settleGuildWeekly() {
console.log('————— settleGuildWeekly —————');
const guildList = await GuildModel.findAllGuild('code activeWeekly memberCnt serverId');
// 周结算时，1. 不能变动memberCnt 2.玩家activeWeekly不能变动 3.公会activeWeekly不能变动
for(let { code, memberCnt, serverId } of guildList) {
let res:any = await lockData(serverId, GUILD_DATA_NAME.WEEKLY_GUILD_SUM, code);//加锁
if (!!res.err) {
await ErrLogModel.create(`settle guild lock data error: ${res.err}`)
}
const userGuildList = await UserGuildModel.getListByGuild(code, 'roleId auth activeWeekly', { activeWeekly: -1, activeUpdateTime: 1 });
let otherMemberCnt = 0; // 除了大将军以外从活跃高到底成员人数，用户计算活跃排名百分比
@@ -189,7 +217,7 @@ export async function settleGuildWeekly() {
if(otherMemberCnt <= rankCnt) break;
}
}
await UserGuildModel.updateInfo(roleId, { job,/* activeWeekly: 0*/ }, {});
await UserGuildModel.updateInfo(roleId, { job, activeWeekly: 0 }, {});
if(activeWeekly > ARMY.ARMY_WEEKHONOUR_LIMIT) { // 低于一定不发奖励
members.set(roleId, job);
@@ -211,6 +239,7 @@ export async function settleGuildWeekly() {
}
await GuildModel.updateInfo(code, { activeWeekly: 0 }, {});
res.releaseCallback();//解锁
}
await initSingleRank(REDIS_KEY.GUILD_ACTIVE_RANK);
await SystemConfigModel.updateSystemConfig({settleGuildWeeklyTime: nowSeconds()}); // 记录一下