qixin/HJ_Server
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge remote-tracking branch 'origin/dev' into dev

Browse Source
This commit is contained in:
dy 2023-12-26 15:07:52 +08:00
commit 45e149c2c0
2 changed files with 340 additions and 339 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/api_s2c/wzry/ApiDldFight.ts
View File

@ -16,7 +16,7 @@ export default async function (call: ApiCall<ReqDldFight, ResDldFight>) {
if (!gotLock) { if (!gotLock) {
return call.errorCode(-101); // -101 并发请求, 告知客户端稍后再试 request_too_fast return call.errorCode(-101); // -101 并发请求, 告知客户端稍后再试 request_too_fast
} }
await G.ioredis.pexpire(lockKey, 500); // 设置 ttl 避免死锁. 策划要求: 500ms await G.ioredis.expire(lockKey, 1); // 设置 ttl 避免死锁
let status = await WangZheRongYaofun.getWangZheStatus(); let status = await WangZheRongYaofun.getWangZheStatus();
if (status.status != 3) { if (status.status != 3) {
// 未到大乱斗时间 // 未到大乱斗时间

677
src/shared/protocols/serviceProto.ts
View File

File diff suppressed because it is too large Load Diff