From 9a9d6ac524c144ccb235655463a48131a51e20d8 Mon Sep 17 00:00:00 2001
From: wangchuxiao <wangchuxiao97@outlook.com>
Date: Thu, 10 Nov 2022 15:32:01 +0800
Subject: [PATCH] config

---
 config/usualConfig.yaml     | 1 +
 pkg/common/config/config.go | 6 +++++-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/config/usualConfig.yaml b/config/usualConfig.yaml
index cd9ab305d..5dfe1102f 100644
--- a/config/usualConfig.yaml
+++ b/config/usualConfig.yaml
@@ -20,6 +20,7 @@ kafka:
 
 credential:
   minio:
+    endpoint:  #发图片视频文件需要填写
     accessKeyID: root
     secretAccessKey: openIM123
 
diff --git a/pkg/common/config/config.go b/pkg/common/config/config.go
index 97a0c4808..3046d490c 100644
--- a/pkg/common/config/config.go
+++ b/pkg/common/config/config.go
@@ -585,6 +585,7 @@ type usualConfig struct {
 		Minio struct {
 			AccessKeyID     string `yaml:"accessKeyID"`
 			SecretAccessKey string `yaml:"secretAccessKey"`
+			Endpoint        string `yaml:"endPoint"`
 		} `yaml:"minio"`
 	} `yaml:"credential"`
 
@@ -677,10 +678,12 @@ func init() {
 	if Config.Credential.Minio.AccessKeyID == "" {
 		Config.Credential.Minio.AccessKeyID = UsualConfig.Credential.Minio.AccessKeyID
 	}
-
 	if Config.Credential.Minio.SecretAccessKey == "" {
 		Config.Credential.Minio.SecretAccessKey = UsualConfig.Credential.Minio.SecretAccessKey
 	}
+	if Config.Credential.Minio.Endpoint == "" {
+		Config.Credential.Minio.Endpoint = UsualConfig.Credential.Minio.Endpoint
+	}
 
 	if Config.MessageVerify.FriendVerify == nil {
 		Config.MessageVerify.FriendVerify = &UsualConfig.Messageverify.FriendVerify
@@ -693,4 +696,5 @@ func init() {
 	if Config.Push.Getui.Enable == nil {
 		Config.Push.Getui.Enable = &UsualConfig.Push.Getui.Enable
 	}
+
 }