diff --git a/extensions/servers/gin/domains/proxy/models.go b/extensions/servers/gin/domains/proxy/models.go index a46aecc..77634ec 100644 --- a/extensions/servers/gin/domains/proxy/models.go +++ b/extensions/servers/gin/domains/proxy/models.go @@ -1,14 +1,17 @@ package proxy +import "github.com/vortex14/gotyphoon/interfaces" + type Settings struct { BlockedTime int CheckTime int CheckBlockedTime int - RedisHost string ConcurrentCheck int Port int PrefixNamespace string CheckHosts []string + + interfaces.RedisDetails } type Stats struct { diff --git a/extensions/servers/gin/domains/proxy/proxy.go b/extensions/servers/gin/domains/proxy/proxy.go index cdb7ba8..70b9508 100644 --- a/extensions/servers/gin/domains/proxy/proxy.go +++ b/extensions/servers/gin/domains/proxy/proxy.go @@ -366,7 +366,9 @@ func (c *Collection) Init() *Collection { Config: &interfaces.ServiceRedis{ Name: "Redis proxy data", Details: interfaces.RedisDetails{ - Host: c.Settings.RedisHost, Port: 6379, + Host: c.Settings.RedisDetails.Host, + Port: c.Settings.RedisDetails.Port, + Password: c.Settings.Password, }, }, } diff --git a/extensions/servers/gin/domains/proxy/server_test.go b/extensions/servers/gin/domains/proxy/server_test.go index dc2ec62..654b736 100644 --- a/extensions/servers/gin/domains/proxy/server_test.go +++ b/extensions/servers/gin/domains/proxy/server_test.go @@ -53,9 +53,12 @@ var ( BlockedTime: BlockedTime, CheckTime: CheckTime, CheckBlockedTime: CheckBlockedTime, - RedisHost: "localhost", - ConcurrentCheck: 3, - Port: 11222, + RedisDetails: interfaces.RedisDetails{ + Host: "localhost", + Port: 6379, + }, + ConcurrentCheck: 3, + Port: 11222, } ) diff --git a/integrations/redis/redis.go b/integrations/redis/redis.go index 642d4f0..73b6bff 100644 --- a/integrations/redis/redis.go +++ b/integrations/redis/redis.go @@ -25,9 +25,9 @@ func (s *Service) initClient() { redisString := fmt.Sprintf("%s:%d", s.Config.GetHost(), s.Config.GetPort()) color.Yellow("init Redis Service %s", redisString) rdb := redis.NewClient(&redis.Options{ - Addr: redisString, // use default Addr - Password: "", // no password set - DB: 0, // use default DB + Addr: redisString, // use default Addr + Password: s.Config.Details.Password, // no password set + DB: 0, // use default DB }) s.client = rdb conn := s.connect() diff --git a/interfaces/structs.go b/interfaces/structs.go index fa79600..37168a6 100644 --- a/interfaces/structs.go +++ b/interfaces/structs.go @@ -88,9 +88,9 @@ type MapFileObjects map[string]*FileObject type BuilderOptions builders.BuildOptions type RedisDetails struct { - Host string `yaml:"host"` - Port int `yaml:"port"` - Password interface{} `yaml:"password"` + Host string `yaml:"host"` + Port int `yaml:"port"` + Password string `yaml:"password"` } type ServiceRedis struct {