From eb36ab810ba7fdc9b6f66ccf408e496e4948dd54 Mon Sep 17 00:00:00 2001
From: withchao <993506633@qq.com>
Date: Mon, 22 Apr 2024 10:26:26 +0800
Subject: [PATCH 1/2] fix: priority url

---
 pkg/common/config/config.go | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/pkg/common/config/config.go b/pkg/common/config/config.go
index 19edccbab..27ee4d272 100644
--- a/pkg/common/config/config.go
+++ b/pkg/common/config/config.go
@@ -477,16 +477,20 @@ func (k *Kafka) Build() *kafka.Config {
 	}
 }
 func (m *Minio) Build() *minio.Config {
-	return &minio.Config{
+	conf := minio.Config{
 		Bucket:          m.Bucket,
 		Endpoint:        fmt.Sprintf("http://%s:%d", m.InternalIP, m.Port),
 		AccessKeyID:     m.AccessKeyID,
 		SecretAccessKey: m.SecretAccessKey,
 		SessionToken:    m.SessionToken,
-		SignEndpoint:    fmt.Sprintf("http://%s:%d", m.ExternalIP, m.Port),
 		PublicRead:      m.PublicRead,
 	}
-
+	if m.URL == "" {
+		conf.SignEndpoint = fmt.Sprintf("http://%s:%d", m.ExternalIP, m.Port)
+	} else {
+		conf.SignEndpoint = m.URL
+	}
+	return &conf
 }
 func (c *Cos) Build() *cos.Config {
 	return &cos.Config{

From d12008fdaf5b48bf928c4bb39f5bc6cee697ce1e Mon Sep 17 00:00:00 2001
From: withchao <993506633@qq.com>
Date: Mon, 22 Apr 2024 10:41:45 +0800
Subject: [PATCH 2/2] fix: minio config

---
 config/minio.yml            |  8 +++-----
 pkg/common/config/config.go | 19 +++++++++++--------
 2 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/config/minio.yml b/config/minio.yml
index 0cabb7f36..0a80bb845 100644
--- a/config/minio.yml
+++ b/config/minio.yml
@@ -1,9 +1,7 @@
 bucket: "openim"
-port: 10005
 accessKeyID: "root"
 secretAccessKey: "openIM123"
 sessionToken: ''
-internalIP: localhost
-externalIP: 150.109.93.151
-url: https://image.rentsoft.cn/
-publicRead: false
+internalAddress: "minio:9000"
+externalAddress: "http://external_ip:10005"
+publicRead: false
\ No newline at end of file
diff --git a/pkg/common/config/config.go b/pkg/common/config/config.go
index 27ee4d272..df2639cab 100644
--- a/pkg/common/config/config.go
+++ b/pkg/common/config/config.go
@@ -22,6 +22,7 @@ import (
 	"github.com/openimsdk/tools/s3/cos"
 	"github.com/openimsdk/tools/s3/minio"
 	"github.com/openimsdk/tools/s3/oss"
+	"net"
 	"time"
 )
 
@@ -52,13 +53,11 @@ type Log struct {
 
 type Minio struct {
 	Bucket          string `mapstructure:"bucket"`
-	Port            int    `mapstructure:"port"`
 	AccessKeyID     string `mapstructure:"accessKeyID"`
 	SecretAccessKey string `mapstructure:"secretAccessKey"`
 	SessionToken    string `mapstructure:"sessionToken"`
-	InternalIP      string `mapstructure:"internalIP"`
-	ExternalIP      string `mapstructure:"externalIP"`
-	URL             string `mapstructure:"url"`
+	InternalAddress string `mapstructure:"internalAddress"`
+	ExternalAddress string `mapstructure:"externalAddress"`
 	PublicRead      bool   `mapstructure:"publicRead"`
 }
 
@@ -479,16 +478,20 @@ func (k *Kafka) Build() *kafka.Config {
 func (m *Minio) Build() *minio.Config {
 	conf := minio.Config{
 		Bucket:          m.Bucket,
-		Endpoint:        fmt.Sprintf("http://%s:%d", m.InternalIP, m.Port),
 		AccessKeyID:     m.AccessKeyID,
 		SecretAccessKey: m.SecretAccessKey,
 		SessionToken:    m.SessionToken,
 		PublicRead:      m.PublicRead,
 	}
-	if m.URL == "" {
-		conf.SignEndpoint = fmt.Sprintf("http://%s:%d", m.ExternalIP, m.Port)
+	if _, _, err := net.SplitHostPort(m.InternalAddress); err == nil {
+		conf.Endpoint = fmt.Sprintf("http://%s", m.InternalAddress)
 	} else {
-		conf.SignEndpoint = m.URL
+		conf.Endpoint = m.InternalAddress
+	}
+	if _, _, err := net.SplitHostPort(m.ExternalAddress); err == nil {
+		conf.SignEndpoint = fmt.Sprintf("http://%s", m.ExternalAddress)
+	} else {
+		conf.SignEndpoint = m.ExternalAddress
 	}
 	return &conf
 }