From 78a5e0b1cd840b56aa40ba760af7ab94b1d9df55 Mon Sep 17 00:00:00 2001 From: luhaoling <2198702716@qq.com> Date: Wed, 31 Jan 2024 09:59:10 +0800 Subject: [PATCH] fix: del get env in minio conneted --- pkg/rpcclient/third.go | 20 ++------------------ 1 file changed, 2 insertions(+), 18 deletions(-) diff --git a/pkg/rpcclient/third.go b/pkg/rpcclient/third.go index b636f4d6f..0d5708fc8 100755 --- a/pkg/rpcclient/third.go +++ b/pkg/rpcclient/third.go @@ -18,10 +18,8 @@ import ( "context" "github.com/minio/minio-go/v7" "github.com/minio/minio-go/v7/pkg/credentials" - "net/url" - "os" - "google.golang.org/grpc" + "net/url" "github.com/OpenIMSDK/protocol/third" "github.com/OpenIMSDK/tools/discoveryregistry" @@ -49,7 +47,7 @@ func NewThird(discov discoveryregistry.SvcDiscoveryRegistry) *Third { func minioInit() (*minio.Client, error) { minioClient := &minio.Client{} var initUrl string - initUrl = getMinioAddr("MINIO_ENDPOINT", "MINIO_ADDRESS", "MINIO_PORT", config.Config.Object.Minio.Endpoint) + initUrl = config.Config.Object.Minio.Endpoint minioUrl, err := url.Parse(initUrl) if err != nil { return nil, err @@ -69,17 +67,3 @@ func minioInit() (*minio.Client, error) { } return minioClient, nil } - -func getMinioAddr(key1, key2, key3, fallback string) string { - // Prioritize environment variables - endpoint, endpointExist := os.LookupEnv(key1) - if !endpointExist { - endpoint = fallback - } - address, addressExist := os.LookupEnv(key2) - port, portExist := os.LookupEnv(key3) - if portExist && addressExist { - endpoint = "http://" + address + ":" + port - } - return endpoint -}