Commit 9f45e0f6 authored by hujiebin's avatar hujiebin

Merge branch 'feature/svip89' into test

parents 91421ef9 87a5e0e7
...@@ -11,7 +11,6 @@ import ( ...@@ -11,7 +11,6 @@ import (
"google.golang.org/grpc/resolver" "google.golang.org/grpc/resolver"
"google.golang.org/grpc/resolver/manual" "google.golang.org/grpc/resolver/manual"
"hilo-socketCenter/common" "hilo-socketCenter/common"
"hilo-socketCenter/common/dingding"
"hilo-socketCenter/common/mylogrus" "hilo-socketCenter/common/mylogrus"
"hilo-socketCenter/common/redisCli" "hilo-socketCenter/common/redisCli"
"hilo-socketCenter/domain/model/rpc_m" "hilo-socketCenter/domain/model/rpc_m"
...@@ -113,11 +112,12 @@ func check() { ...@@ -113,11 +112,12 @@ func check() {
mylogrus.MyLog.Infof("cron sendGiftChan msg error,left %v-%v", l, err) mylogrus.MyLog.Infof("cron sendGiftChan msg error,left %v-%v", l, err)
} }
if l > MONITOR_LENGTH { if l > MONITOR_LENGTH {
go func() { mylogrus.MyLog.Infof("送礼横幅变化通知延迟,队列%s长度:%d", SocketQueueSendGift, l)
if sErr := dingding.SendDingRobot(dingding.ROBOTWEBHOOK, fmt.Sprintf("送礼横幅变化通知延迟,队列%s长度:%d", SocketQueueSendGift, l), true); sErr != nil { //go func() {
mylogrus.MyLog.Errorf("dingding msg fail:%v", sErr) // 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() n, err := redisCli.GetRedisCluster().Del(context.Background(), SocketQueueSendGift).Result()
mylogrus.MyLog.Infof("del sendGiftChan msg queue:%v,n:%v,err:%v", SocketQueueSendGift, n, err) mylogrus.MyLog.Infof("del sendGiftChan msg queue:%v,n:%v,err:%v", SocketQueueSendGift, n, err)
} }
......
...@@ -214,6 +214,7 @@ message GlobalGiftBanner { ...@@ -214,6 +214,7 @@ message GlobalGiftBanner {
uint32 cpLevel = 15; // cp等级 uint32 cpLevel = 15; // cp等级
string receiveUserAvatar = 16; string receiveUserAvatar = 16;
uint32 nobleLevel = 17; // 贵族等级 uint32 nobleLevel = 17; // 贵族等级
string custom_effect_url = 18; // 定制特效url
} }
/* id == 116 横幅的回应,用来测量RTT */ /* id == 116 横幅的回应,用来测量RTT */
......
[DATABASE] [DATABASE]
MYSQL_HOST=ua4papc3hmgqf351pbej-rw4rm.rwlb.dubai.rds.aliyuncs.com MYSQL_HOST=172.28.16.44
MYSQL_USERNAME=nextvideo MYSQL_USERNAME=hilo_master
MYSQL_PASSWORD=ihlUwI4nhi9W88MI MYSQL_PASSWORD=o8NNd8F7e6On2RqIgOhsy1PsiSxROT3n
MYSQL_DB=hilo MYSQL_DB=hilo
[DATABASECODE] [DATABASECODE]
MYSQL_HOST=ua4papc3hmgqf351pbej-rw4rm.rwlb.dubai.rds.aliyuncs.com MYSQL_HOST=172.28.16.44
MYSQL_USERNAME=nextvideo MYSQL_USERNAME=hilo_master
MYSQL_PASSWORD=ihlUwI4nhi9W88MI MYSQL_PASSWORD=o8NNd8F7e6On2RqIgOhsy1PsiSxROT3n
MYSQL_DB=hilo_code MYSQL_DB=hilo_code
[REDIS] [REDIS]
REDIS_HOST=r-eb3btxn8vfdsuwdbuf.redis.dubai.rds.aliyuncs.com:6379 REDIS_HOST=172.28.16.31:6379
REDIS_PASSWORD= REDIS_PASSWORD=
REDIS_CLUSTER_HOST=r-eb3yt6k8zgxs62kjjs.redis.dubai.rds.aliyuncs.com:6379 REDIS_CLUSTER_HOST=172.28.16.47:6379
REDIS_CLUSTER_PASSWORD= REDIS_CLUSTER_PASSWORD=
[JWT] [JWT]
SECRET=hilo1504 SECRET=hilo1504
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment