Merge branch 'fix/group_country' into 'master'

Fix/group country

See merge request !72

cron/group_cron/group_list.go

@@ -20,7 +20,7 @@ func GroupCountryListSort() {
 	})
 
 	// 非常用国家-每60分钟计算国家房间列表排序 /v1/imGroup/country [get] 接口
-	spec2 := "0 51 * * * ?"
+	spec2 := "0 59 * * * ?"
 	_ = c.AddFunc(spec2, func() {
 		var model = domain.CreateModelNil()
 		model.Log.Infof("GroupCountryListSort not Common start")

domain/model/res_m/country.go

@@ -217,6 +217,6 @@ func GetLangeByCountry(db *gorm.DB, country mysql.Str) (string, error) {
 //获取所有国家名字列表
 func GetCountryNameList(model *domain.Model) ([]string, error) {
 	res := make([]string, 0)
-	err := model.DB().Select("distinct(name) name").Pluck("name", &res).Error
+	err := model.DB().Table("res_country").Select("distinct(name) name").Pluck("name", &res).Error
 	return res, myerr.WrapErr(err)
 }

domain/service/group_s/group_list.go

@@ -4,7 +4,6 @@ import (
 	"context"
 	"git.hilo.cn/hilo-common/_const/rediskey"
 	"git.hilo.cn/hilo-common/domain"
-	"git.hilo.cn/hilo-common/resource/redisCli"
 	"github.com/go-redis/redis/v8"
 	"hilo-group/_const/enum/gift_e"
 	"hilo-group/cv/gift_cv"
@@ -68,13 +67,13 @@ func setToRedis(model *domain.Model, country string, groupList []string) error {
 	// 写入redis
 	key := rediskey.GetGroupCountrySortList(country)
 	for idx, group := range groupList {
-		err := redisCli.GetRedis().ZRemRangeByRank(context.Background(), key, int64(idx), int64(idx)).Err() // 先删除旧的
+		err := model.RedisCluster.ZRemRangeByRank(context.Background(), key, int64(idx), int64(idx)).Err() // 先删除旧的
 		if err != nil {
 			model.Log.Errorf("setToRedis SortGroup key:%v, idx:%v, err:%v", key, idx, err)
 			return err
 		}
 		// 插入
-		err = redisCli.GetRedis().ZAdd(context.Background(), key, &redis.Z{Score: float64(idx), Member: group}).Err()
+		err = model.RedisCluster.ZAdd(context.Background(), key, &redis.Z{Score: float64(idx), Member: group}).Err()
 		if err != nil {
 			model.Log.Errorf("setToRedis SortGroup key:%v, idx:%v, group:%s, err:%v", key, idx, group, err)
 			return err