From ea179c2a3cb4f3639f9b6027f514527d0f960625 Mon Sep 17 00:00:00 2001
From: ciniao <4041990@qq.com>
Date: Mon, 18 Dec 2023 15:50:28 +0800
Subject: [PATCH] =?UTF-8?q?redis=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/public/email.ts | 2 +-
 src/public/gud.ts   | 8 +++++---
 src/setRedis.ts     | 5 ++---
 3 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/src/public/email.ts b/src/public/email.ts
index e4b6f41..1f70f02 100644
--- a/src/public/email.ts
+++ b/src/public/email.ts
@@ -172,7 +172,7 @@ export class EmailFun {
             sendEmail.sid = uid.split('_')[0]
         }
 
-        if (prize.length > 0) {
+        if (prize?.length > 0) {
             sendEmail.prizeData = {
                 prize: email.prize,
                 isGet: false
diff --git a/src/public/gud.ts b/src/public/gud.ts
index 47fb68a..8ba809b 100644
--- a/src/public/gud.ts
+++ b/src/public/gud.ts
@@ -18,9 +18,11 @@ export async function clearGud(uid) {
         G.ioredis.del(`gudVersion:${uid}_pid`);
         G.ioredis.del(`gudVersion:${uid}_ver`);
     }
-    G.redis.del("equip",uid);
-    G.redis.del("hero",uid);
-    G.redis.del("shiwu",uid);
+    
+    if(await G.redis.type('tanxian', uid)){
+        console.log('清空tanxian Redis',uid);
+        G.redis.del("tanxian",uid);
+    }
 };
 
 /**
diff --git a/src/setRedis.ts b/src/setRedis.ts
index 0ea3cdd..b27ee0c 100644
--- a/src/setRedis.ts
+++ b/src/setRedis.ts
@@ -60,10 +60,9 @@ export async function initRedis() {
     //启动前清理redis残余数据
     clusterRunOnce(async () => {
         await clearRedis();
+        await setRedis();
     })
-
     if (G.config.cleanRedis) await redisClient.flushDb();
-    await setRedis();
     console.log('connect redis succ');
 }
 
@@ -77,7 +76,7 @@ async function clearRedis() {
         G.redis.fromatKey('item'),
         G.redis.fromatKey('hero'),
         G.redis.fromatKey('equip'),
-        //G.redis.fromatKey('shiwu'),
+        G.redis.fromatKey('shiwu'),
         //G.redis.fromatKey('gbtx'),
         //G.redis.fromatKey('dxlt'),
     ])