diff --git a/main.go b/main.go index 64a74d48e73043e720a8fb2170a3c6c0328338c1..1ef787c64d0f4f6be5f0d24e3c39316e1f55df20 100644 --- a/main.go +++ b/main.go @@ -11,7 +11,6 @@ import ( "google.golang.org/grpc/resolver" "google.golang.org/grpc/resolver/manual" "hilo-socketCenter/common" - "hilo-socketCenter/common/dingding" "hilo-socketCenter/common/mylogrus" "hilo-socketCenter/common/redisCli" "hilo-socketCenter/domain/model/rpc_m" @@ -113,11 +112,12 @@ func check() { mylogrus.MyLog.Infof("cron sendGiftChan msg error,left %v-%v", l, err) } if l > MONITOR_LENGTH { - go func() { - if sErr := dingding.SendDingRobot(dingding.ROBOTWEBHOOK, fmt.Sprintf("送礼横幅变化通知延迟,队列%s长度:%d", SocketQueueSendGift, l), true); sErr != nil { - mylogrus.MyLog.Errorf("dingding msg fail:%v", sErr) - } - }() + mylogrus.MyLog.Infof("送礼横幅变化通知延迟,队列%s长度:%d", SocketQueueSendGift, l) + //go func() { + // if sErr := dingding.SendDingRobot(dingding.ROBOTWEBHOOK, fmt.Sprintf("送礼横幅变化通知延迟,队列%s长度:%d", SocketQueueSendGift, l), true); sErr != nil { + // mylogrus.MyLog.Errorf("dingding msg fail:%v", sErr) + // } + //}() n, err := redisCli.GetRedisCluster().Del(context.Background(), SocketQueueSendGift).Result() mylogrus.MyLog.Infof("del sendGiftChan msg queue:%v,n:%v,err:%v", SocketQueueSendGift, n, err) } diff --git a/protocol/userProxy.proto b/protocol/userProxy.proto index d269cf3a5423f9ce2edb60eb2ec59190325e9974..2bb6bd6d0b11b69f964e15a21d6ff0a01d5787d1 100644 --- a/protocol/userProxy.proto +++ b/protocol/userProxy.proto @@ -214,6 +214,7 @@ message GlobalGiftBanner { uint32 cpLevel = 15; // cp等级 string receiveUserAvatar = 16; uint32 nobleLevel = 17; // 贵族等级 + string custom_effect_url = 18; // 定制特效url } /* id == 116 横幅的回应,用来测量RTT */ diff --git a/release.ini b/release.ini index 0b67f890443379f88fe319b7362a4b64fe8b9d53..b18611052c3b9914df7114ecca5cbfda84e5cf9b 100644 --- a/release.ini +++ b/release.ini @@ -1,17 +1,17 @@ [DATABASE] -MYSQL_HOST=ua4papc3hmgqf351pbej-rw4rm.rwlb.dubai.rds.aliyuncs.com -MYSQL_USERNAME=nextvideo -MYSQL_PASSWORD=ihlUwI4nhi9W88MI +MYSQL_HOST=172.28.16.44 +MYSQL_USERNAME=hilo_master +MYSQL_PASSWORD=o8NNd8F7e6On2RqIgOhsy1PsiSxROT3n MYSQL_DB=hilo [DATABASECODE] -MYSQL_HOST=ua4papc3hmgqf351pbej-rw4rm.rwlb.dubai.rds.aliyuncs.com -MYSQL_USERNAME=nextvideo -MYSQL_PASSWORD=ihlUwI4nhi9W88MI +MYSQL_HOST=172.28.16.44 +MYSQL_USERNAME=hilo_master +MYSQL_PASSWORD=o8NNd8F7e6On2RqIgOhsy1PsiSxROT3n MYSQL_DB=hilo_code [REDIS] -REDIS_HOST=r-eb3btxn8vfdsuwdbuf.redis.dubai.rds.aliyuncs.com:6379 +REDIS_HOST=172.28.16.31:6379 REDIS_PASSWORD= -REDIS_CLUSTER_HOST=r-eb3yt6k8zgxs62kjjs.redis.dubai.rds.aliyuncs.com:6379 +REDIS_CLUSTER_HOST=172.28.16.47:6379 REDIS_CLUSTER_PASSWORD= [JWT] SECRET=hilo1504