common/config/config.go

@@ -17,6 +17,10 @@ func AppIsRelease() bool {
 	return GetMode() == RELEASE
 }
 
+func AppIsLocal() bool {
+	return GetMode() == LOCAL
+}
+
 //数据库的配置
 type MysqlConfig struct {
 	MYSQL_HOST     string

common/mylogrus/log.go

@@ -24,7 +24,7 @@ func init() {
 	filenamePrefix = logDir + filepath.Base(os.Args[0]) + "."
 	// stderr日志重定向
 	MyLog.SetOutput(os.Stdout)
-	RewriteStderrFile()
+	//RewriteStderrFile()
 
 	if config.AppIsRelease() {
 		MyLog.SetFormatter(&logrus.JSONFormatter{

debug.ini

 [DATABASE]
-MYSQL_HOST=47.244.34.27:3306
-MYSQL_USERNAME=root
-MYSQL_PASSWORD=yX0jPAhO0I4s2zlA
+MYSQL_HOST=hk-cynosdbmysql-grp-a3wqck8p.sql.tencentcdb.com:22303
+MYSQL_USERNAME=hilo_test
+MYSQL_PASSWORD=cPsTMSA9szQ6B9Y2zFXSvpDdduB8kZxC
 MYSQL_DB=hilo
 [DATABASECODE]
-MYSQL_HOST=47.244.34.27:3306
-MYSQL_USERNAME=root
-MYSQL_PASSWORD=yX0jPAhO0I4s2zlA
+MYSQL_HOST=hk-cynosdbmysql-grp-a3wqck8p.sql.tencentcdb.com:22303
+MYSQL_USERNAME=hilo_test
+MYSQL_PASSWORD=cPsTMSA9szQ6B9Y2zFXSvpDdduB8kZxC
 MYSQL_DB=hilo_code
 [REDIS]
-REDIS_HOST=47.244.34.27:6379
-REDIS_PASSWORD=8QZ9JD1zLvPR3yHf
-REDIS_CLUSTER_HOST=47.244.34.27:6379
-REDIS_CLUSTER_PASSWORD=8QZ9JD1zLvPR3yHf
+REDIS_HOST=172.19.0.2:6379
+REDIS_PASSWORD=yPyZH1DYMJhrVQgr
+REDIS_CLUSTER_HOST=172.19.0.2:6379
+REDIS_CLUSTER_PASSWORD=yPyZH1DYMJhrVQgr
 [JWT]
 SECRET=hilo1632
 ISSUER_API=hiloApi

local.ini

 [DATABASE]
-MYSQL_HOST=47.244.34.27:3306
-MYSQL_USERNAME=root
-MYSQL_PASSWORD=yX0jPAhO0I4s2zlA
+MYSQL_HOST=hk-cynosdbmysql-grp-a3wqck8p.sql.tencentcdb.com:22303
+MYSQL_USERNAME=hilo_test
+MYSQL_PASSWORD=cPsTMSA9szQ6B9Y2zFXSvpDdduB8kZxC
 MYSQL_DB=hilo
 [DATABASECODE]
-MYSQL_HOST=47.244.34.27:3306
-MYSQL_USERNAME=root
-MYSQL_PASSWORD=yX0jPAhO0I4s2zlA
+MYSQL_HOST=hk-cynosdbmysql-grp-a3wqck8p.sql.tencentcdb.com:22303
+MYSQL_USERNAME=hilo_test
+MYSQL_PASSWORD=cPsTMSA9szQ6B9Y2zFXSvpDdduB8kZxC
 MYSQL_DB=hilo_code
 [REDIS]
-REDIS_HOST=47.244.34.27:6379
-REDIS_PASSWORD=8QZ9JD1zLvPR3yHf
-REDIS_CLUSTER_HOST=47.244.34.27:6379
-REDIS_CLUSTER_PASSWORD=8QZ9JD1zLvPR3yHf
+REDIS_HOST=43.135.4.137:6379
+REDIS_PASSWORD=yPyZH1DYMJhrVQgr
+REDIS_CLUSTER_HOST=43.135.4.137:6379
+REDIS_CLUSTER_PASSWORD=yPyZH1DYMJhrVQgr
 [JWT]
 SECRET=hilo1632
 ISSUER_API=hiloApi

manager/userManager.go

@@ -138,8 +138,9 @@ func (m *UserManager) GetAreaUsers(userIds []uint64, area int8) map[uint64]UserT
 
 // 获取财富等级大于某等级的用户
 // 开区间
-func (m *UserManager) GetLevelUsers(userIds []uint64, wealthLevel int32) map[uint64]UserTinyArea {
+func (m *UserManager) GetLevelUsers(userIds []uint64, wealthLevel int32) (map[uint64]UserTinyArea, []uint64) {
 	res := make(map[uint64]UserTinyArea)
+	var resIds []uint64
 	// 从db中读,暂时不缓存(几千个)
 	var users []UserTinyArea
 	if err := m.MysqlDB.Table("user").Joins("JOIN match_wealth_user_score ON match_wealth_user_score.user_id = user.id").
@@ -148,7 +149,7 @@ func (m *UserManager) GetLevelUsers(userIds []uint64, wealthLevel int32) map[uin
 		Where("match_wealth_user_score.grade > ?", wealthLevel).
 		Find(&users).Error; err != nil {
 		mylogrus.MyLog.Errorf("GetLevelUsers fail:%v", err)
-		return res
+		return res, resIds
 	}
 	for _, u := range users {
 		a := m.GetArea(u.Country)
@@ -161,6 +162,7 @@ func (m *UserManager) GetLevelUsers(userIds []uint64, wealthLevel int32) map[uin
 			Area:       a,
 			Avatar:     u.Avatar,
 		}
+		resIds = append(resIds, u.ID)
 	}
-	return res
+	return res, resIds
 }

protocol/userCenter.proto

@@ -136,6 +136,7 @@ message LevelMessage {
   int32 level = 1;
   uint32 msgType = 2;
   bytes payLoad = 3;
+  int32 area = 4;
 }
 
 message LevelMessageRsp {

release.ini

 [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