...
 
Commits (8)
[DATABASE] [DATABASE]
MYSQL_HOST=47.244.34.27:3306 MYSQL_HOST=hk-cynosdbmysql-grp-a3wqck8p.sql.tencentcdb.com:22303
MYSQL_USERNAME=root MYSQL_USERNAME=hilo_test
MYSQL_PASSWORD=yX0jPAhO0I4s2zlA MYSQL_PASSWORD=cPsTMSA9szQ6B9Y2zFXSvpDdduB8kZxC
MYSQL_DB=hilo MYSQL_DB=hilo
[DATABASECODE] [DATABASECODE]
MYSQL_HOST=47.244.34.27:3306 MYSQL_HOST=hk-cynosdbmysql-grp-a3wqck8p.sql.tencentcdb.com:22303
MYSQL_USERNAME=root MYSQL_USERNAME=hilo_test
MYSQL_PASSWORD=yX0jPAhO0I4s2zlA MYSQL_PASSWORD=cPsTMSA9szQ6B9Y2zFXSvpDdduB8kZxC
MYSQL_DB=hilo_code MYSQL_DB=hilo_code
[REDIS] [REDIS]
REDIS_HOST=47.244.34.27:6379 REDIS_HOST=172.19.0.2:6379
REDIS_PASSWORD=8QZ9JD1zLvPR3yHf REDIS_PASSWORD=yPyZH1DYMJhrVQgr
REDIS_CLUSTER_HOST=47.244.34.27:6379 REDIS_CLUSTER_HOST=172.19.0.2:6379
REDIS_CLUSTER_PASSWORD=8QZ9JD1zLvPR3yHf REDIS_CLUSTER_PASSWORD=yPyZH1DYMJhrVQgr
[JWT] [JWT]
SECRET=hilo1632 SECRET=hilo1632
ISSUER_API=hiloApi ISSUER_API=hiloApi
......
[DATABASE] [DATABASE]
MYSQL_HOST=47.244.34.27:3306 MYSQL_HOST=hk-cynosdbmysql-grp-a3wqck8p.sql.tencentcdb.com:22303
MYSQL_USERNAME=root MYSQL_USERNAME=hilo_test
MYSQL_PASSWORD=yX0jPAhO0I4s2zlA MYSQL_PASSWORD=cPsTMSA9szQ6B9Y2zFXSvpDdduB8kZxC
MYSQL_DB=hilo MYSQL_DB=hilo
[DATABASECODE] [DATABASECODE]
MYSQL_HOST=47.244.34.27:3306 MYSQL_HOST=hk-cynosdbmysql-grp-a3wqck8p.sql.tencentcdb.com:22303
MYSQL_USERNAME=root MYSQL_USERNAME=hilo_test
MYSQL_PASSWORD=yX0jPAhO0I4s2zlA MYSQL_PASSWORD=cPsTMSA9szQ6B9Y2zFXSvpDdduB8kZxC
MYSQL_DB=hilo_code MYSQL_DB=hilo_code
[REDIS] [REDIS]
REDIS_HOST=47.244.34.27:6379 REDIS_HOST=172.19.0.2:6379
REDIS_PASSWORD=8QZ9JD1zLvPR3yHf REDIS_PASSWORD=yPyZH1DYMJhrVQgr
REDIS_CLUSTER_HOST=47.244.34.27:6379 REDIS_CLUSTER_HOST=172.19.0.2:6379
REDIS_CLUSTER_PASSWORD=8QZ9JD1zLvPR3yHf REDIS_CLUSTER_PASSWORD=yPyZH1DYMJhrVQgr
[JWT] [JWT]
SECRET=hilo1632 SECRET=hilo1632
ISSUER_API=hiloApi ISSUER_API=hiloApi
......
...@@ -6,14 +6,11 @@ import ( ...@@ -6,14 +6,11 @@ import (
"fmt" "fmt"
"github.com/go-redis/redis/v8" "github.com/go-redis/redis/v8"
"github.com/golang/protobuf/proto" "github.com/golang/protobuf/proto"
"github.com/hashicorp/consul/api"
"google.golang.org/grpc" "google.golang.org/grpc"
"google.golang.org/grpc/keepalive" "google.golang.org/grpc/keepalive"
"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/consul"
"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"
...@@ -43,24 +40,22 @@ var kacp = keepalive.ClientParameters{ ...@@ -43,24 +40,22 @@ var kacp = keepalive.ClientParameters{
// 初始化userCenterClient // 初始化userCenterClient
func init() { func init() {
client, err := api.NewClient(api.DefaultConfig()) //非默认情况下需要设置实际的参数 redisKey := fmt.Sprintf("service:userCenter")
ipPorts, err := redisCli.GetRedisCluster().ZRangeByScore(context.Background(), redisKey, &redis.ZRangeBy{
Min: fmt.Sprintf("%d", time.Now().Add(-time.Second*15).Unix()), // 3倍心跳
Max: "+inf",
}).Result()
if err != nil { if err != nil {
mylogrus.MyLog.Fatalln(err) failMsg := fmt.Sprintf("get service fail,svc:%v,err:%v", "userCenter", err)
mylogrus.MyLog.Errorf(failMsg)
} else if len(ipPorts) > 0 {
} }
cataLog := client.Catalog() if len(ipPorts) <= 0 {
if cataLog == nil { ipPorts = []string{"127.0.0.1:50040"}
mylogrus.MyLog.Fatalln("No catalog.")
}
addr, err := consul.GetServices(cataLog, "userCenter")
if err != nil {
mylogrus.MyLog.Fatalln(err)
}
if len(addr) == 0 {
mylogrus.MyLog.Fatalln("No userCenter available.")
} }
addresses := make([]resolver.Address, len(addr)) addresses := make([]resolver.Address, len(ipPorts))
for i, s := range addr { for i, s := range ipPorts {
addresses[i].Addr = s addresses[i].Addr = s
mylogrus.MyLog.Infof("address : %s", s) mylogrus.MyLog.Infof("address : %s", s)
} }
...@@ -117,17 +112,15 @@ func check() { ...@@ -117,17 +112,15 @@ 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)
} }
if l > 0 {
mylogrus.MyLog.Infof("cron sendGiftChan msg,left %v", l)
}
} }
} }
} }
......
...@@ -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
......