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

2023-12-26 15:07:52 +08:00 · 2023-12-26 15:07:52 +08:00 · 45e149c2c0
commit 45e149c2c0
parent b5288be10a e3f0b4347e
2 changed files with 340 additions and 339 deletions
--- a/src/api_s2c/wzry/ApiDldFight.ts
+++ b/src/api_s2c/wzry/ApiDldFight.ts
@ -16,7 +16,7 @@ export default async function (call: ApiCall<ReqDldFight, ResDldFight>) {
    if (!gotLock) {
        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();
    if (status.status != 3) {
        // 未到大乱斗时间
--- a/src/shared/protocols/serviceProto.ts
+++ b/src/shared/protocols/serviceProto.ts