'修复冲突'

README.md

@@ -5,6 +5,7 @@
 对阿里云oss-golang sdk 进行上传、删除的简单封装，便于使用
 上传使用字节流，内自带 *os.File | *multipart.FileHeader 文件类型转字节流，
 以及使用字符串路径 例如：./test.png 。测试案例oss_test.go中有不同操作的案例
+新版兼容文件[]byte化上传
 
 #install 
 go get github.com/cowardmrx/go_aliyun_oss
@@ -23,8 +24,8 @@ go get github.com/cowardmrx/go_aliyun_oss
 
 	ossClient := ossConfig.CreateOssConnect()
     
-    //put 方法返回完整的oss 可访问地址
+    //put 方法返回完整的oss 可访问地址 第三个参数 如果文件不是[]byte数组的可以直接传递空，如果是[]byte也可以是空，会默认给出一个png的文件类型，建议实际中给出文件类型
-	uri := ossClient.Put("logo/","./File/3HaqWaOzJWD86DDvZD9Pmn9VUEOBOBbuWackGOXb (2).jpeg")
+	uri := ossClient.Put("logo/","./File/3HaqWaOzJWD86DDvZD9Pmn9VUEOBOBbuWackGOXb (2).jpeg","")
     fmt.Println(uri)
 
     //HasExists 方法返回一个bool值 true-存在 false-不存在
@@ -43,6 +44,4 @@ go get github.com/cowardmrx/go_aliyun_oss
     })
     fmt.Println(isSuccess)
 	
-
+#详细使用方法请参照oss_test.go文件中的示例
-
-

file.go

@@ -24,13 +24,14 @@ type OssFileInterface interface {
 	GetFileType() *OssFile
 }
 
-// file type transform
+// FileTypeTransForm file type transform
 //@title 文件类型转换
 func (ossFile *OssFile) FileTypeTransForm() (*OssFile,error) {
 	var err error
 
 	switch ossFile.File.(type) {
 	case *os.File:
+
 		ossFile.FileByte,err = ioutil.ReadAll(ossFile.File.(*os.File))
 
 		if err != nil {
@@ -39,6 +40,8 @@ func (ossFile *OssFile) FileTypeTransForm() (*OssFile,error) {
 
 		_,ossFile.FileOldName = filepath.Split(ossFile.File.(*os.File).Name())
 
+		break
+
 	case *multipart.FileHeader:
 
 		fileResources,err := ossFile.File.(*multipart.FileHeader).Open()
@@ -57,6 +60,8 @@ func (ossFile *OssFile) FileTypeTransForm() (*OssFile,error) {
 
 		ossFile.FileOldName = ossFile.File.(*multipart.FileHeader).Filename
 
+		break
+
 	case string:
 		newFile,err := os.Open(ossFile.File.(string))
 
@@ -70,6 +75,21 @@ func (ossFile *OssFile) FileTypeTransForm() (*OssFile,error) {
 
 		_,ossFile.FileOldName = filepath.Split(newFile.Name())
 
+		break
+
+	// 支持[]byte数组传递 因为无法解析文件类型 默认直接给出文件类型为.png
+	case []byte:
+		ossFile.FileByte = ossFile.File.([]byte)
+
+		//判断是否指定了文件的类型 如果没有指定默认为png格式
+		if ossFile.FileType == "" || len(ossFile.FileType) <= 0 {
+			ossFile.FileOldName = uuid.NewV4().String() + ".png"
+		} else {
+			ossFile.FileOldName = uuid.NewV4().String() + ossFile.FileType
+		}
+
+		break
+
 	default:
 		fmt.Println(reflect.TypeOf(ossFile.File))
 		panic("file type is not support" )
@@ -80,15 +100,19 @@ func (ossFile *OssFile) FileTypeTransForm() (*OssFile,error) {
 	return ossFile,nil
 }
 
-//split file type and generate file name
+// GetFileType split file type and generate file name
 //截取文件类型
 func (ossFile *OssFile) GetFileType() *OssFile {
+
+	// 当没有传递文件类型时去文件名中截取出文件类型
+	if ossFile.FileType == "" || len(ossFile.FileType) <= 0 {
 		//from oldFileName split file type
 		fileTypeSufIndex := strings.Index(ossFile.FileOldName,".")
 
 		fileType := ossFile.FileOldName[fileTypeSufIndex:]
 
 		ossFile.FileType = fileType
+	}
 
 	//generate only file name
 	ossFile.FileNewName = uuid.NewV5(uuid.NewV4(),ossFile.FileOldName).String() + ossFile.FileType

oss_client.go

@@ -20,7 +20,7 @@ type AliOssConfigInterface interface {
 	GetAccessibleUrl() string
 }
 
-//check AliOssConfig value is exists
+// CheckConfig check AliOssConfig value is exists
 func (coon *AliOssConfig) CheckConfig() {
 	//check endPoint
 	if coon.EndPoint == "" || len(coon.EndPoint) <= 0 {
@@ -49,7 +49,7 @@ func (coon *AliOssConfig) CheckConfig() {
 
 }
 
-//en: create oss connect client
+// CreateOssConnect en: create oss connect client
 //创建阿里云oss 链接客户端
 func (coon *AliOssConfig) CreateOssConnect() *AliOssClient {
 	//config check
@@ -82,7 +82,7 @@ func (coon *AliOssConfig) CreateOssConnect() *AliOssClient {
 	}
 }
 
-//get oss accessible url
+// GetAccessibleUrl get oss accessible url
 //拼接阿里云oss可访问地址
 func (coon *AliOssConfig) GetAccessibleUrl() string {
 	var domain string

oss_operation.go

@@ -11,15 +11,23 @@ type AliOssClient struct {
 	Client *oss.Bucket
 }
 
-//推送文件到oss
+type ossResponse struct {
+	Host string
+	LongPath string
+	ShortPath string
+	FileName string
+}
+
+// Put 推送文件到oss
 //params:  ossDir string  `oss dir [要推送到的oss目录]`  example: test/20201121/
 //params:  file interface `upload file resource [文件资源]`
 //return string  `oss file accessible uri [可访问地址]`
-func (client *AliOssClient) Put(ossDir string, file interface{}) string {
+func (client *AliOssClient) Put(ossDir string, file interface{},fileType string) *ossResponse {
 	//file to []byte
 	//文件转字节流
 	uploadFile := &OssFile{
 		File: file,
+		FileType: fileType,
 	}
 
 	ossFile,err := uploadFile.FileTypeTransForm()
@@ -28,6 +36,9 @@ func (client *AliOssClient) Put(ossDir string, file interface{}) string {
 		panic("transfer file failed" + err.Error())
 	}
 
+	// 最终的oss名称
+	var ossFileName string
+
 	//ossPath = oss dir + upload file name
 	//example: oss dir is diy ==== test/20201121/
 	//time.Now().Format("20060102")
@@ -37,8 +48,10 @@ func (client *AliOssClient) Put(ossDir string, file interface{}) string {
 	//judge is use origin file name if false fileName = fileNewName (is a only name) else file init name
 	if client.OriginalFileName == false {
 		ossPath = ossDir + ossFile.FileNewName
+		ossFileName = ossFile.FileNewName
 	} else {
 		ossPath = ossDir + ossFile.FileOldName
+		ossFileName = ossFile.FileOldName
 	}
 
 	//upload file to oss
@@ -48,10 +61,15 @@ func (client *AliOssClient) Put(ossDir string, file interface{}) string {
 		panic("put file to oss failed:" + err.Error())
 	}
 
-	return client.Domain + "/" + ossPath
+	return &ossResponse{
+		Host: client.Domain,
+		LongPath: client.Domain + "/" + ossPath,
+		ShortPath: ossPath,
+		FileName: ossFileName,
+	}
 }
 
-//校验文件是否已经存在
+// HasExists 校验文件是否已经存在
 //check file already exists in oss server
 //params: ossFilePath	string 	`file oss path [文件的oss的路径]`
 func (client *AliOssClient) HasExists(ossFilePath string) bool {
@@ -66,7 +84,7 @@ func (client *AliOssClient) HasExists(ossFilePath string) bool {
 	return isExists
 }
 
-//删除文件-单文件删除
+// Delete 删除文件-单文件删除
 //delete one file in oss
 //params ossPath string `file oss path [文件的oss路径]`
 //return bool
@@ -82,7 +100,7 @@ func (client *AliOssClient) Delete(ossFilePath string) bool {
 	return true
 }
 
-//删除文件-多文件删除
+// DeleteMore 删除文件-多文件删除
 //delete more file in oss
 //params ossPath []string `file oss path array [文件的oss路径数组]`
 //return bool
@@ -96,3 +114,26 @@ func (client *AliOssClient) DeleteMore(ossFilePath []string) bool {
 
 	return true
 }
+
+// GetTemporaryUrl 获取文件临时地址
+// path string 文件路径
+// expireInSecond int64 多久后过期 单位: 秒，默认 60
+func (client *AliOssClient) GetTemporaryUrl(path string,expireInSecond int64) string {
+
+	var expireTime int64
+
+	if expireInSecond <= 0 {
+		expireTime = 60
+	} else {
+		expireTime = expireInSecond
+	}
+
+	signUrl,err := client.Client.SignURL(path,oss.HTTPGet,expireTime)
+
+	if err != nil {
+		panic("generate sign url failed:" + err.Error())
+	}
+
+	return signUrl
+
+}

oss_test.go

@@ -1,7 +1,9 @@
 package go_aliyun_oss
 
 import (
+	"encoding/base64"
 	"fmt"
+	"io/ioutil"
 	"testing"
 )
 
@@ -15,11 +17,35 @@ func TestPut(t *testing.T)  {
 
 	client := ossConfig.CreateOssConnect()
 
-	uri := client.Put("logo/","./File/3HaqWaOzJWD86DDvZD9Pmn9VUEOBOBbuWackGOXb (2).jpeg")
+	uri := client.Put("logo/","./File/3HaqWaOzJWD86DDvZD9Pmn9VUEOBOBbuWackGOXb (2).jpeg",".png")
 
 	fmt.Println(uri)
 }
 
+func TestPutBase64(t *testing.T)  {
+	ossConfig := &AliOssConfig{
+		EndPoint: "",
+		AccessKeyId: "",
+		AccessKeySecret: "",
+		BucketName: "",
+	}
+
+	client := ossConfig.CreateOssConnect()
+
+	// 读取base
+	file,_ := ioutil.ReadFile("./File/3HaqWaOzJWD86DDvZD9Pmn9VUEOBOBbuWackGOXb (2).jpeg")
+
+
+	fileStr := base64.StdEncoding.EncodeToString(file)
+
+	bat,_ := base64.StdEncoding.DecodeString(fileStr)
+
+
+	uri := client.Put("logo/",bat,".png")
+	//
+	fmt.Println(uri)
+}
+
 func TestExists(t *testing.T)  {
 	ossConfig := &AliOssConfig{
 		EndPoint: "oss-cn-shenzhen.aliyuncs.com",
@@ -68,3 +94,18 @@ func TestAliOssClient_DeleteMore(t *testing.T) {
 	fmt.Println(deleteRes)
 }
 
+func TestAliOssClient_GetTemporaryUrl(t *testing.T) {
+	ossConfig := &AliOssConfig{
+		EndPoint: "",
+		AccessKeyId: "",
+		AccessKeySecret: "",
+		BucketName: "",
+	}
+
+	client := ossConfig.CreateOssConnect()
+
+	singUrl := client.GetTemporaryUrl("logo/8497b913-2a79-58a1-984b-c25827f8212e.png",180)
+
+	fmt.Println(singUrl)
+}
+