storage interface add minio

Author: wangchuxiao-dev

internal/common/minio.go

@@ -66,11 +66,7 @@ func (m *Minio) upload(filePath, fileType string, onProgressFun func(int)) (stri
 	}
 	// fake callback
 	onProgressFun(100)
-	reqParams := make(url.Values)
-	log.NewInfo("", reqParams)
-
 	presignedURL := endPoint.String() + "/" + minioResp.BucketName + "/" + newName
-	log.NewInfo("", presignedURL)
 	return presignedURL, newName, nil
 }
 

internal/login/init_login.go

@@ -1,7 +1,6 @@
 package login
 
 import (
-	"errors"
 	comm2 "open_im_sdk/internal/common"
 	conv "open_im_sdk/internal/conversation_msg"
 	"open_im_sdk/internal/friend"
@@ -138,15 +137,21 @@ func (u *LoginMgr) login(userID, token string, cb open_im_sdk_callback.Base, ope
 	u.group.SetGroupListener(u.groupListener)
 
 	u.full = full.NewFull(u.user, u.friend, u.group)
-	if u.imConfig.ObjectStorage != "cos" && u.imConfig.ObjectStorage != "" {
-		err = errors.New("u.imConfig.ObjectStorage failed ")
-		common.CheckConfigErrCallback(cb, err, operationID)
-	}
+	//if u.imConfig.ObjectStorage != "cos" && u.imConfig.ObjectStorage != "" {
+	//	err = errors.New("u.imConfig.ObjectStorage failed ")
+	//	common.CheckConfigErrCallback(cb, err, operationID)
+	//}
 	log.NewInfo(operationID, u.imConfig.ObjectStorage)
 	u.forcedSynchronization()
 	log.Info(operationID, "forcedSynchronization success...")
 	log.NewInfo(operationID, u.imConfig.ObjectStorage)
-	objStorage := comm2.NewCOS(p)
+	var objStorage comm2.ObjectStorage
+	switch u.imConfig.ObjectStorage {
+	case "cos":
+		objStorage = comm2.NewCOS(p)
+	case "minio":
+		objStorage = comm2.NewMinio(p)
+	}
 	u.conversation = conv.NewConversation(u.ws, u.db, p, u.conversationCh,
 		u.loginUserID, u.imConfig.Platform, u.imConfig.DataDir,
 		u.friend, u.group, u.user, objStorage, u.conversationListener, u.advancedMsgListener)

main/main.go

@@ -21,10 +21,10 @@ import (
 
 func main() {
 
-	//strMyUidx := "13900000000"
+	strMyUidx := "13900000000"
 	//friendUserID := "openIM2222"
-	//tokenx := "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJVSUQiOiIxMzkwMDAwMDAwMCIsIlBsYXRmb3JtIjoiSU9TIiwiZXhwIjoxNjQ1ODYyMzIzLCJuYmYiOjE2NDUyNTc1MjMsImlhdCI6MTY0NTI1NzUyM30.TsrIgtKZhnbAUjjGFNnJvdzVQECLIaIJy_bvfRlNF4k"
-	//test.InOutDoTest(strMyUidx, tokenx, WSADDR, APIADDR)
+	tokenx := "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJVSUQiOiIxMzkwMDAwMDAwMCIsIlBsYXRmb3JtIjoiSU9TIiwiZXhwIjoxOTYwNzk0Mjg0LCJuYmYiOjE2NDU0MzQyODQsImlhdCI6MTY0NTQzNDI4NH0.pchFgEhL6vaYirWuAbMnVTcrQTk552i50_SWXlOHbuo"
+	test.InOutDoTest(strMyUidx, tokenx, WSADDR, APIADDR)
 	//tokenx := "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJVSUQiOiIxODY2NjY2MjQxMiIsIlBsYXRmb3JtIjoiSU9TIiwiZXhwIjoxNjQ1Njg5NjU3LCJuYmYiOjE2NDUwODQ4NTcsImlhdCI6MTY0NTA4NDg1N30.nV3cIcvaRjyUEay8G7UMe5LzKeNi6UenET1RXDT4Nao"
 	//test.InOutDoTest(strMyUidx, tokenx, WSADDR, APIADDR)
 	//test.DoTestCreateGroup()
@@ -41,7 +41,7 @@ func main() {
 
 	//	test.DoSetGroupInfo()
 	//test.DotestGetGroupMemberList()
-	test.DotestMinio()
+	//test.DotestMinio()
 	//test.DotestKickGroupMember()
 	//	test.DotestInviteUserToGroup()
 	//test.DotestGetGroupApplicationList()

test/t_group_sdk.go

@@ -273,24 +273,24 @@ func test(storage common.ObjectStorage, callback baseCallback) {
 	//	}
 	//})
 	//log.NewInfo("0", dir, newName, err)
-	dir, newName, err := storage.UploadImage("C:\\Users\\Administrator\\Desktop\\1.jpg", func(progress int) {
-		if progress == 100 {
-			callback.OnSuccess("")
-		}
-	})
-	log.NewInfo("0", dir, newName, err, err)
-	//dir, newName, err = storage.UploadSound("./main/main.go", func(progress int) {
+	//dir, newName, err = storage.UploadImage("C:\\Users\\Administrator\\Desktop\\1.jpg", func(progress int) {
 	//	if progress == 100 {
 	//		callback.OnSuccess("")
 	//	}
 	//})
 	//log.NewInfo("0", dir, newName, err, err)
-	//snapshotURL, snapshotUUID, videoURL, videoUUID, err := storage.UploadVideo("./main/main.go", "", func(progress int) {
+	//dir, newName, err = storage.UploadSound("./main/main.go", func(progress int) {
 	//	if progress == 100 {
 	//		callback.OnSuccess("")
 	//	}
 	//})
-	//log.NewInfo(snapshotURL, snapshotUUID, videoURL, videoUUID, err)
+	//log.NewInfo("0", dir, newName, err, err)
+	snapshotURL, snapshotUUID, videoURL, videoUUID, err := storage.UploadVideo("./main/main.go", "C:\\Users\\Administrator\\Desktop\\1.jpg", func(progress int) {
+		if progress == 100 {
+			callback.OnSuccess("")
+		}
+	})
+	log.NewInfo(snapshotURL, snapshotUUID, videoURL, videoUUID, err)
 }
 
 type testGetGroupMembersInfo struct {