From 7eea511f33bd6195a83e55eec73eca9ac499cf5d Mon Sep 17 00:00:00 2001
From: JiebinHu <458249864@qq.com>
Date: Sat, 2 Sep 2023 20:27:03 +0800
Subject: [PATCH] =?UTF-8?q?=E5=85=BC=E5=AE=B9=E6=96=B0=E6=97=A7redis?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 common/redisCli/redis.go | 20 ++++++++++++++++++++
 main.go                  | 30 ++++++++++++++++++++++++++++++
 2 files changed, 50 insertions(+)

diff --git a/common/redisCli/redis.go b/common/redisCli/redis.go
index a2b1e3d..c486ea9 100644
--- a/common/redisCli/redis.go
+++ b/common/redisCli/redis.go
@@ -9,6 +9,7 @@ import (
 )
 
 var RedisCluster *redis.Client
+var RedisClient *redis.Client
 
 func init() {
 	RedisCluster = redis.NewClient(&redis.Options{
@@ -25,6 +26,21 @@ func init() {
 	} else {
 		log.Println("redis db0 connection success - " + pong)
 	}
+
+	RedisClient = redis.NewClient(&redis.Options{
+		Addr:         config.GetConfigRedis().REDIS_HOST,
+		Password:     config.GetConfigRedis().REDIS_PASSWORD, // no password set
+		DB:           0,                                      // use default DB
+		PoolSize:     200,
+		MinIdleConns: 20,
+	})
+	pong, err = RedisClient.Ping(context.Background()).Result()
+	if err != nil {
+		mylogrus.MyLog.Warn(err)
+		mylogrus.MyLog.Fatal("redis db0 connect fail")
+	} else {
+		log.Println("redis db0 connection success - " + pong)
+	}
 	// log hook
 	//RedisClient.AddHook(redisHook{})
 }
@@ -32,3 +48,7 @@ func init() {
 func GetRedisCluster() *redis.Client {
 	return RedisCluster
 }
+
+func GetRedisClient() *redis.Client {
+	return RedisClient
+}
diff --git a/main.go b/main.go
index 4491e33..0fe9810 100644
--- a/main.go
+++ b/main.go
@@ -28,6 +28,9 @@ func main() {
 		go func() {
 			deal()
 		}()
+		go func() {
+			dealOld() // 临时处理
+		}()
 	}
 	for i := 0; i < SEND_WORKER; i++ {
 		go func() {
@@ -89,6 +92,33 @@ func deal() {
 	}
 }
 
+func dealOld() {
+	for true {
+		//不需要加锁，注意，阻塞。
+		strs, err := redisCli.GetRedisClient().BLPop(context.Background(), time.Second, micInfoChange).Result()
+		if err != nil {
+			if err != redis.Nil {
+				mylogrus.MyLog.Errorf("cron micChangeSys redisCli.GetRedis().BLPop err:+%v", err)
+			}
+		}
+		if len(strs) >= 2 {
+			content := strs[1]
+			//mylogrus.MyLog.Infof("cron micChangeSys content:%v", content)
+			micSystemMsg := MicSystemMsg{}
+			if err := json.Unmarshal([]byte(content), &micSystemMsg); err != nil {
+				mylogrus.MyLog.Errorf("cron micChangeSys Unmarshal err:%+v, content:%v", err, content)
+			}
+			sendChan <- GroupSystemMsg{
+				MsgGroupUid: micSystemMsg.GroupUid,
+				MsgId:       micSystemMsg.MsgId,
+				Source:      micSystemMsg.Source,
+				Target:      micSystemMsg.Target,
+				Content:     micSystemMsg.Content,
+			}
+		}
+	}
+}
+
 //var limiter = rate.NewLimiter(2000, 2000)
 
 func send() {
-- 
2.22.0