fix: fix the conflect

go.mod

@@ -5,7 +5,7 @@ go 1.19
 require (
 	firebase.google.com/go v3.13.0+incompatible
 	github.com/OpenIMSDK/protocol v0.0.55
-	github.com/OpenIMSDK/tools v0.0.36
+	github.com/OpenIMSDK/tools v0.0.37
 	github.com/bwmarrin/snowflake v0.3.0 // indirect
 	github.com/dtm-labs/rockscache v0.1.1
 	github.com/gin-gonic/gin v1.9.1

go.sum

@@ -20,8 +20,8 @@ github.com/IBM/sarama v1.42.2 h1:VoY4hVIZ+WQJ8G9KNY/SQlWguBQXQ9uvFPOnrcu8hEw=
 github.com/IBM/sarama v1.42.2/go.mod h1:FLPGUGwYqEs62hq2bVG6Io2+5n+pS6s/WOXVKWSLFtE=
 github.com/OpenIMSDK/protocol v0.0.55 h1:eBjg8DyuhxGmuCUjpoZjg6MJJJXU/xJ3xJwFhrn34yA=
 github.com/OpenIMSDK/protocol v0.0.55/go.mod h1:F25dFrwrIx3lkNoiuf6FkCfxuwf8L4Z8UIsdTHP/r0Y=
-github.com/OpenIMSDK/tools v0.0.36 h1:BT0q64l4f3QJDW16Rc0uJYt1gQFkiPoUQYQ33vo0EcE=
+github.com/OpenIMSDK/tools v0.0.37 h1:qvDqmA4RbEJtPjZouWCkVuf/pjm6Y8nUrG5iH2gcnOg=
-github.com/OpenIMSDK/tools v0.0.36/go.mod h1:wBfR5CYmEyvxl03QJbTkhz1CluK6J4/lX0lviu8JAjE=
+github.com/OpenIMSDK/tools v0.0.37/go.mod h1:wBfR5CYmEyvxl03QJbTkhz1CluK6J4/lX0lviu8JAjE=
 github.com/QcloudApi/qcloud_sign_golang v0.0.0-20141224014652-e4130a326409/go.mod h1:1pk82RBxDY/JZnPQrtqHlUFfCctgdorsd9M06fMynOM=
 github.com/alcortesm/tgz v0.0.0-20161220082320-9c5fe88206d7 h1:uSoVVbwJiQipAclBbw+8quDsfcvFjOpI5iCf4p/cqCs=
 github.com/alcortesm/tgz v0.0.0-20161220082320-9c5fe88206d7/go.mod h1:6zEj6s6u/ghQa61ZWa/C2Aw3RkjiTBOix7dkqa1VLIs=

pkg/common/db/s3/cos/cos.go

@@ -23,6 +23,7 @@ import (
 	"encoding/json"
 	"errors"
 	"fmt"
+	"github.com/OpenIMSDK/tools/errs"
 	"net/http"
 	"net/url"
 	"strconv"
@@ -229,7 +230,7 @@ func (c *Cos) CopyObject(ctx context.Context, src string, dst string) (*s3.CopyO
 }
 
 func (c *Cos) IsNotFound(err error) bool {
-	switch e := err.(type) {
+	switch e := errs.Unwrap(err).(type) {
 	case *cos.ErrorResponse:
 		return e.Response.StatusCode == http.StatusNotFound || e.Code == "NoSuchKey"
 	default:

pkg/common/db/s3/minio/minio.go

@@ -18,6 +18,7 @@ import (
 	"context"
 	"errors"
 	"fmt"
+	"github.com/OpenIMSDK/tools/errs"
 	"io"
 	"net/http"
 	"net/url"
@@ -67,7 +68,6 @@ type Config struct {
 }
 
 func NewMinio(cache cache.MinioCache, conf Config) (s3.Interface, error) {
-	fmt.Printf("minio config: %+v", conf)
 	u, err := url.Parse(conf.Endpoint)
 	if err != nil {
 		return nil, err
@@ -81,6 +81,7 @@ func NewMinio(cache cache.MinioCache, conf Config) (s3.Interface, error) {
 		return nil, err
 	}
 	m := &Minio{
+		conf:   conf,
 		bucket: conf.Bucket,
 		core:   &minio.Core{Client: client},
 		lock:   &sync.Mutex{},
@@ -351,10 +352,7 @@ func (m *Minio) CopyObject(ctx context.Context, src string, dst string) (*s3.Cop
 }
 
 func (m *Minio) IsNotFound(err error) bool {
-	if err == nil {
+	switch e := errs.Unwrap(err).(type) {
-		return false
-	}
-	switch e := err.(type) {
 	case minio.ErrorResponse:
 		return e.StatusCode == http.StatusNotFound || e.Code == "NoSuchKey"
 	case *minio.ErrorResponse:

pkg/common/db/s3/oss/oss.go

@@ -241,7 +241,7 @@ func (o *OSS) CopyObject(ctx context.Context, src string, dst string) (*s3.CopyO
 }
 
 func (o *OSS) IsNotFound(err error) bool {
-	switch e := err.(type) {
+	switch e := errs.Unwrap(err).(type) {
 	case oss.ServiceError:
 		return e.StatusCode == http.StatusNotFound || e.Code == "NoSuchKey"
 	case *oss.ServiceError:

tools/component/component.go

@@ -19,14 +19,12 @@ import (
 	"flag"
 	"fmt"
 	"os"
+	"strconv"
 	"strings"
 	"time"
 
 	"github.com/IBM/sarama"
 
-	"github.com/openimsdk/open-im-server/v3/pkg/common/db/cache"
-	"github.com/openimsdk/open-im-server/v3/pkg/common/db/unrelation"
-	"github.com/openimsdk/open-im-server/v3/pkg/common/discoveryregister/zookeeper"
 	"github.com/openimsdk/open-im-server/v3/pkg/common/kafka"
 
 	"github.com/OpenIMSDK/tools/component"
@@ -40,7 +38,7 @@ import (
 const (
 	// defaultCfgPath is the default path of the configuration file.
 	defaultCfgPath = "../../../../../config/config.yaml"
-	maxRetry       = 300
+	maxRetry       = 100
 )
 
 var (
@@ -77,7 +75,11 @@ func main() {
 		return
 	}
 
-	configGetEnv()
+	err = configGetEnv(conf)
+	if err != nil {
+		fmt.Printf("configGetEnv failed,err:%v", err)
+		return
+	}
 
 	checks := []checkFunc{
 		//{name: "Mysql", function: checkMysql},
@@ -100,9 +102,13 @@ func main() {
 			if !check.flag {
 				err = check.function(check.config)
 				if err != nil {
-					component.ErrorPrint(fmt.Sprintf("Starting %s failed:%v.", check.name, err))
 					allSuccess = false
-
+					component.ErrorPrint(fmt.Sprintf("Starting %s failed:%v.", check.name, errs.Unwrap(err).Error()))
+					if !strings.Contains(errs.Unwrap(err).Error(), "connection refused") &&
+						!strings.Contains(errs.Unwrap(err).Error(), "timeout waiting") {
+						component.ErrorPrint("Some components started failed!")
+						os.Exit(-1)
+					}
 				} else {
 					checks[index].flag = true
 					component.SuccessPrint(fmt.Sprintf("%s connected successfully", check.name))
@@ -115,23 +121,38 @@ func main() {
 			return
 		}
 	}
+	component.ErrorPrint("Some components started failed!")
+	os.Exit(-1)
 }
 
 // checkMongo checks the MongoDB connection without retries
 func checkMongo(config *config.GlobalConfig) error {
-	_, err := unrelation.NewMongo(config)
+	mongoStu := &component.Mongo{
+		URL:         config.Mongo.Uri,
+		Address:     config.Mongo.Address,
+		Database:    config.Mongo.Database,
+		Username:    config.Mongo.Username,
+		Password:    config.Mongo.Password,
+		MaxPoolSize: config.Mongo.MaxPoolSize,
+	}
+	err := component.CheckMongo(mongoStu)
+
 	return err
 }
 
 // checkRedis checks the Redis connection
 func checkRedis(config *config.GlobalConfig) error {
-	_, err := cache.NewRedis(config)
+	redisStu := &component.Redis{
+		Address:  config.Redis.Address,
+		Username: config.Redis.Username,
+		Password: config.Redis.Password,
+	}
+	err := component.CheckRedis(redisStu)
 	return err
 }
 
 // checkMinio checks the MinIO connection
 func checkMinio(config *config.GlobalConfig) error {
-
 	// Check if MinIO is enabled
 	if config.Object.Enable != "minio" {
 		return errs.Wrap(errors.New("minio.Enable is empty"))
@@ -150,7 +171,13 @@ func checkMinio(config *config.GlobalConfig) error {
 
 // checkZookeeper checks the Zookeeper connection
 func checkZookeeper(config *config.GlobalConfig) error {
-	_, err := zookeeper.NewZookeeperDiscoveryRegister(config)
+	zkStu := &component.Zookeeper{
+		Schema:   config.Zookeeper.Schema,
+		ZkAddr:   config.Zookeeper.ZkAddr,
+		Username: config.Zookeeper.Username,
+		Password: config.Zookeeper.Password,
+	}
+	err := component.CheckZookeeper(zkStu)
 	return err
 }
 
@@ -241,16 +268,38 @@ func isTopicPresent(topic string, topics []string) bool {
 	return false
 }
 
-func configGetEnv() {
+func configGetEnv(config *config.GlobalConfig) error {
-	config.Config.Object.Minio.AccessKeyID = getEnv("MINIO_ACCESS_KEY_ID", config.Config.Object.Minio.AccessKeyID)
+	config.Mongo.Uri = getEnv("MONGO_URI", config.Mongo.Uri)
-	config.Config.Object.Minio.SecretAccessKey = getEnv("MINIO_SECRET_ACCESS_KEY", config.Config.Object.Minio.SecretAccessKey)
+	config.Mongo.Username = getEnv("MONGO_OPENIM_USERNAME", config.Mongo.Username)
-	config.Config.Mongo.Uri = getEnv("MONGO_URI", config.Config.Mongo.Uri)
+	config.Mongo.Password = getEnv("MONGO_OPENIM_PASSWORD", config.Mongo.Password)
-	config.Config.Mongo.Username = getEnv("MONGO_OPENIM_USERNAME", config.Config.Mongo.Username)
+	config.Mongo.Address = getArrEnv("MONGO_ADDRESS", "MONGO_PORT", config.Mongo.Address)
-	config.Config.Mongo.Password = getEnv("MONGO_OPENIM_PASSWORD", config.Config.Mongo.Password)
+	config.Mongo.Database = getEnv("MONGO_DATABASE", config.Mongo.Database)
-	config.Config.Kafka.Username = getEnv("KAFKA_USERNAME", config.Config.Kafka.Username)
+	maxPoolSize, err := getEnvInt("MONGO_DATABASE", config.Mongo.MaxPoolSize)
-	config.Config.Kafka.Password = getEnv("KAFKA_PASSWORD", config.Config.Kafka.Password)
+	if err != nil {
-	config.Config.Kafka.Addr = strings.Split(getEnv("KAFKA_ADDRESS", strings.Join(config.Config.Kafka.Addr, ",")), ",")
+		return err
-	config.Config.Object.Minio.Endpoint = getMinioAddr("MINIO_ENDPOINT", "MINIO_ADDRESS", "MINIO_PORT", config.Config.Object.Minio.Endpoint)
+	}
+	config.Mongo.MaxPoolSize = maxPoolSize
+
+	config.Redis.Username = getEnv("REDIS_USERNAME", config.Redis.Username)
+	config.Redis.Password = getEnv("REDIS_PASSWORD", config.Redis.Password)
+	config.Redis.Address = getArrEnv("REDIS_ADDRESS", "REDIS_PASSWORD", config.Redis.Address)
+
+	config.Object.ApiURL = getEnv("OBJECT_APIURL", config.Object.ApiURL)
+	config.Object.Minio.Endpoint = getEnv("MINIO_ENDPOINT", config.Object.Minio.Endpoint)
+	config.Object.Minio.AccessKeyID = getEnv("MINIO_ACCESS_KEY_ID", config.Object.Minio.AccessKeyID)
+	config.Object.Minio.SecretAccessKey = getEnv("MINIO_SECRET_ACCESS_KEY", config.Object.Minio.SecretAccessKey)
+	config.Object.Minio.SignEndpoint = getEnv("MINIO_SIGN_ENDPOINT", config.Object.Minio.SignEndpoint)
+
+	config.Zookeeper.Schema = getEnv("ZOOKEEPER_SCHEMA", config.Zookeeper.Schema)
+	config.Zookeeper.ZkAddr = getArrEnv("ZOOKEEPER_ADDRESS", "ZOOKEEPER_PORT", config.Zookeeper.ZkAddr)
+	config.Zookeeper.Username = getEnv("ZOOKEEPER_USERNAME", config.Zookeeper.Username)
+	config.Zookeeper.Password = getEnv("ZOOKEEPER_PASSWORD", config.Zookeeper.Password)
+
+	config.Kafka.Username = getEnv("KAFKA_USERNAME", config.Kafka.Username)
+	config.Kafka.Password = getEnv("KAFKA_PASSWORD", config.Kafka.Password)
+	config.Kafka.Addr = getArrEnv("KAFKA_ADDRESS", "KAFKA_PORT", config.Kafka.Addr)
+	config.Object.Minio.Endpoint = getMinioAddr("MINIO_ENDPOINT", "MINIO_ADDRESS", "MINIO_PORT", config.Object.Minio.Endpoint)
+	return nil
 }
 
 func getMinioAddr(key1, key2, key3, fallback string) string {
@@ -272,3 +321,46 @@ func getEnv(key, fallback string) string {
 	}
 	return fallback
 }
+
+// Helper function to get environment variable or default value
+func getEnvInt(key string, fallback int) (int, error) {
+	if value, exists := os.LookupEnv(key); exists {
+		val, err := strconv.Atoi(value)
+		if err != nil {
+			return 0, errs.Wrap(err, "string to int failed")
+		}
+		return val, nil
+	}
+	return fallback, nil
+}
+
+func getArrEnv(key1, key2 string, fallback []string) []string {
+	address, addrExists := os.LookupEnv(key1)
+	port, portExists := os.LookupEnv(key2)
+
+	if addrExists && portExists {
+		addresses := strings.Split(address, ",")
+		for i, addr := range addresses {
+			addresses[i] = addr + ":" + port
+		}
+		return addresses
+	}
+
+	if addrExists && !portExists {
+		addresses := strings.Split(address, ",")
+		for i, addr := range addresses {
+			addresses[i] = addr + ":" + "0"
+		}
+		return addresses
+	}
+
+	if !addrExists && portExists {
+		result := make([]string, len(fallback))
+		for i, addr := range fallback {
+			add := strings.Split(addr, ":")
+			result[i] = add[0] + ":" + port
+		}
+		return result
+	}
+	return fallback
+}