:arrow_up:升级uuid依赖

:zap:优化
:arrow_up:升级了oss依赖
2024-03-07 11:01:37 +08:00 · 2023-02-27 15:25:33 +08:00 · 2022-09-02 10:07:54 +08:00
6 changed files with 115 additions and 135 deletions
--- a/file.go
+++ b/file.go
@@ -1,8 +1,9 @@
 package go_aliyun_oss

 import (
+	"errors"
 	"fmt"
-	uuid "github.com/satori/go.uuid"
+	"github.com/google/uuid"
 	"io/ioutil"
 	"mime/multipart"
 	"os"
@@ -12,42 +13,39 @@ import (
 )

 type OssFile struct {
-	FileByte []byte
+	FileByte    []byte
 	FileOldName string
 	FileNewName string
-	FileType string
-	File	interface{}
+	FileType    string
+	File        interface{}
 }

 type OssFileInterface interface {
-	FileTypeTransForm() (*OssFile,error)
+	FileTypeTransForm() (*OssFile, error)
 	GetFileType() *OssFile
 }

-//	@method: FileTypeTransForm
-//	@description: 文件类型转换
-//	@author: mr.x 2021-06-19 00:28:46
-//	@return: *OssFile
-//	@return: error
-func (ossFile *OssFile) FileTypeTransForm() (*OssFile,error) {
+// 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))
+		ossFile.FileByte, err = ioutil.ReadAll(ossFile.File.(*os.File))

 		if err != nil {
-			panic("read os type file failed:" + err.Error())
+			return nil, errors.New("read os type file failed:" + err.Error())
 		}

-		_,ossFile.FileOldName = filepath.Split(ossFile.File.(*os.File).Name())
+		_, ossFile.FileOldName = filepath.Split(ossFile.File.(*os.File).Name())

 		break

 	case *multipart.FileHeader:

-		fileResources,err := ossFile.File.(*multipart.FileHeader).Open()
+		fileResources, err := ossFile.File.(*multipart.FileHeader).Open()

 		if err != nil {
 			panic("open multipart file failed:" + err.Error())
@@ -55,10 +53,10 @@ func (ossFile *OssFile) FileTypeTransForm() (*OssFile,error) {

 		defer fileResources.Close()

-		ossFile.FileByte,err = ioutil.ReadAll(fileResources)
+		ossFile.FileByte, err = ioutil.ReadAll(fileResources)

 		if err != nil {
-			panic("read multipart file failed:" + err.Error())
+			return nil, errors.New("read multipart file failed:" + err.Error())
 		}

 		ossFile.FileOldName = ossFile.File.(*multipart.FileHeader).Filename
@@ -66,17 +64,17 @@ func (ossFile *OssFile) FileTypeTransForm() (*OssFile,error) {
 		break

 	case string:
-		newFile,err := os.Open(ossFile.File.(string))
+		newFile, err := os.Open(ossFile.File.(string))

 		if err != nil {
-			panic("open file path failed:" + err.Error())
+			return nil, errors.New("open file path failed:" + err.Error())
 		}

 		defer newFile.Close()

-		ossFile.FileByte,err = ioutil.ReadAll(newFile)
+		ossFile.FileByte, err = ioutil.ReadAll(newFile)

-		_,ossFile.FileOldName = filepath.Split(newFile.Name())
+		_, ossFile.FileOldName = filepath.Split(newFile.Name())

 		break

@@ -86,33 +84,31 @@ func (ossFile *OssFile) FileTypeTransForm() (*OssFile,error) {

 		//判断是否指定了文件的类型 如果没有指定默认为png格式
 		if ossFile.FileType == "" || len(ossFile.FileType) <= 0 {
-			ossFile.FileOldName = uuid.NewV4().String() + ".png"
+			ossFile.FileOldName = uuid.NewString() + ".png"
 		} else {
-			ossFile.FileOldName = uuid.NewV4().String() + ossFile.FileType
+			ossFile.FileOldName = uuid.NewString() + ossFile.FileType
 		}

 		break

 	default:
 		fmt.Println(reflect.TypeOf(ossFile.File))
-		panic("file type is not support" )
+		return nil, errors.New("file type is not support")
 	}

 	ossFile.GetFileType()

-	return ossFile,nil
+	return ossFile, nil
 }

-//	@method: GetFileType
-//	@description: 截取文件类型
-//	@author: mr.x 2021-06-19 00:28:52
-//	@return: *OssFile
+// 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,".")
+		fileTypeSufIndex := strings.Index(ossFile.FileOldName, ".")

 		fileType := ossFile.FileOldName[fileTypeSufIndex:]

@@ -120,7 +116,7 @@ func (ossFile *OssFile) GetFileType() *OssFile {
 	}

 	//generate only file name
-	ossFile.FileNewName = uuid.NewV5(uuid.NewV4(),ossFile.FileOldName).String() + ossFile.FileType
+	ossFile.FileNewName = uuid.NewString() + ossFile.FileType

 	return ossFile
-}
+}
--- a/go.mod
+++ b/go.mod
@@ -3,9 +3,9 @@ module github.com/cowardmrx/go_aliyun_oss
 go 1.15

 require (
-	github.com/aliyun/aliyun-oss-go-sdk v2.1.5+incompatible
+	github.com/aliyun/aliyun-oss-go-sdk v2.2.5+incompatible
 	github.com/baiyubin/aliyun-sts-go-sdk v0.0.0-20180326062324-cfa1a18b161f // indirect
-	github.com/satori/go.uuid v1.2.0
+	github.com/google/uuid v1.6.0 // indirect
 	golang.org/x/time v0.0.0-20200630173020-3af7569d3a1e // indirect
 	gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c // indirect
 )
--- a/go.sum
+++ b/go.sum
@@ -1,7 +1,11 @@
 github.com/aliyun/aliyun-oss-go-sdk v2.1.5+incompatible h1:v5yDfjkRY/kOxu05gkh0/D/2wYxbTFCoTr3JqFI0FLE=
 github.com/aliyun/aliyun-oss-go-sdk v2.1.5+incompatible/go.mod h1:T/Aws4fEfogEE9v+HPhhw+CntffsBHJ8nXQCwKr0/g8=
+github.com/aliyun/aliyun-oss-go-sdk v2.2.5+incompatible h1:QoRMR0TCctLDqBCMyOu1eXdZyMw3F7uGA9qPn2J4+R8=
+github.com/aliyun/aliyun-oss-go-sdk v2.2.5+incompatible/go.mod h1:T/Aws4fEfogEE9v+HPhhw+CntffsBHJ8nXQCwKr0/g8=
 github.com/baiyubin/aliyun-sts-go-sdk v0.0.0-20180326062324-cfa1a18b161f h1:ZNv7On9kyUzm7fvRZumSyy/IUiSC7AzL0I1jKKtwooA=
 github.com/baiyubin/aliyun-sts-go-sdk v0.0.0-20180326062324-cfa1a18b161f/go.mod h1:AuiFmCCPBSrqvVMvuqFuk0qogytodnVFVSN5CeJB8Gc=
+github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0=
+github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
 github.com/kr/pretty v0.2.1 h1:Fmg33tUaq4/8ym9TJN1x7sLJnHVwhP33CNkpYV/7rwI=
 github.com/kr/pretty v0.2.1/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI=
 github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
--- a/oss_client.go
+++ b/oss_client.go
@@ -20,9 +20,7 @@ type AliOssConfigInterface interface {
 	GetAccessibleUrl() string
 }

-//	@method: CheckConfig
-//	@description: 校验配置
-//	@author: mr.x 2021-06-19 00:28:17
+// CheckConfig check AliOssConfig value is exists
 func (coon *AliOssConfig) CheckConfig() {
 	//check endPoint
 	if coon.EndPoint == "" || len(coon.EndPoint) <= 0 {
@@ -51,10 +49,8 @@ func (coon *AliOssConfig) CheckConfig() {

 }

-//	@method: CreateOssConnect
-//	@description: 创建阿里云oss 链接客户端
-//	@author: mr.x 2021-06-19 00:28:10
-//	@return: *AliOssClient
+// CreateOssConnect en: create oss connect client
+//创建阿里云oss 链接客户端
 func (coon *AliOssConfig) CreateOssConnect() *AliOssClient {
 	//config check
 	coon.CheckConfig()
@@ -86,10 +82,8 @@ func (coon *AliOssConfig) CreateOssConnect() *AliOssClient {
 	}
 }

-//	@method: GetAccessibleUrl
-//	@description: 拼接阿里云oss可访问地址
-//	@author: mr.x 2021-06-19 00:28:02
-//	@return: string
+// GetAccessibleUrl get oss accessible url
+//拼接阿里云oss可访问地址
 func (coon *AliOssConfig) GetAccessibleUrl() string {
 	var domain string

--- a/oss_operation.go
+++ b/oss_operation.go
@@ -2,42 +2,39 @@ package go_aliyun_oss

 import (
 	"bytes"
+	"errors"
 	"github.com/aliyun/aliyun-oss-go-sdk/oss"
 )

 type AliOssClient struct {
-	Domain string
+	Domain           string
 	OriginalFileName bool
-	Client *oss.Bucket
+	Client           *oss.Bucket
 }

 type ossResponse struct {
-	Host string
-	LongPath string
+	Host      string
+	LongPath  string
 	ShortPath string
-	FileName string
+	FileName  string
 }

-
-//	@method: Put
-//	@description: 推送文件到oss
-//	@author: mr.x 2021-06-19 00:29:08
-//	@param: ossDir string	`[要推送到的oss目录]`  example: test/20201121/
-//	@param: file interface{}	`upload file resource [文件资源]`
-//	@param: fileType string	`文件类型`
-//	@return: *ossResponse 返回oss可访问地址等
-func (client *AliOssClient) Put(ossDir string, file interface{},fileType string) *ossResponse {
+// 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{}, fileType string) (*ossResponse, error) {
 	//file to []byte
 	//文件转字节流
 	uploadFile := &OssFile{
-		File: file,
+		File:     file,
 		FileType: fileType,
 	}

-	ossFile,err := uploadFile.FileTypeTransForm()
+	ossFile, err := uploadFile.FileTypeTransForm()

 	if err != nil {
-		panic("transfer file failed" + err.Error())
+		return nil, err
 	}

 	// 最终的oss名称
@@ -59,78 +56,70 @@ func (client *AliOssClient) Put(ossDir string, file interface{},fileType string)
 	}

 	//upload file to oss
-	err = client.Client.PutObject(ossPath,bytes.NewReader(ossFile.FileByte))
+	err = client.Client.PutObject(ossPath, bytes.NewReader(ossFile.FileByte))

 	if err != nil {
-		panic("put file to oss failed:" + err.Error())
+		return nil, errors.New("put file to oss failed:" + err.Error())
 	}

 	return &ossResponse{
-		Host: client.Domain,
-		LongPath: client.Domain + "/" + ossPath,
+		Host:      client.Domain,
+		LongPath:  client.Domain + "/" + ossPath,
 		ShortPath: ossPath,
-		FileName: ossFileName,
-	}
+		FileName:  ossFileName,
+	}, nil
 }

-//	@method: HasExists
-//	@description: 校验文件是否已经存在
-//	@author: mr.x 2021-06-19 00:30:21
-//	@param: ossFilePath string	file oss path [文件的oss的路径]
-//	@return: bool
-func (client *AliOssClient) HasExists(ossFilePath string) bool {
+// HasExists 校验文件是否已经存在
+// check file already exists in oss server
+// params: ossFilePath	string 	`file oss path [文件的oss的路径]`
+func (client *AliOssClient) HasExists(ossFilePath string) (bool, error) {

 	//oss check fun
-	isExists,err := client.Client.IsObjectExist(ossFilePath)
+	isExists, err := client.Client.IsObjectExist(ossFilePath)

 	if err != nil {
-		panic("check file in oss is exists failed:" + err.Error())
+		return false, errors.New("check file in oss is exists failed:" + err.Error())
 	}

-	return isExists
+	return isExists, nil
 }

-//	@method: Delete
-//	@description: 删除文件-单文件删除
-//	@author: mr.x 2021-06-19 00:30:40
-//	@param: ossFilePath string oss 可访问路径
-//	@return: bool true - 删除成功 | false - 删除失败
-func (client *AliOssClient) Delete(ossFilePath string) bool {
+// Delete 删除文件-单文件删除
+// delete one file in oss
+// params ossPath string `file oss path [文件的oss路径]`
+// return bool
+func (client *AliOssClient) Delete(ossFilePath string) (bool, error) {

 	//oss delete one file fun
 	err := client.Client.DeleteObject(ossFilePath)

 	if err != nil {
-		panic("delete file "+ ossFilePath +" failed:" + err.Error())
+		return false, errors.New("delete file " + ossFilePath + " failed:" + err.Error())
 	}

-	return true
+	return true, nil
 }

-//	@method: DeleteMore
-//	@description: 删除文件-多文件删除
-//	@author: mr.x 2021-06-19 00:30:56
-//	@param: ossFilePath []string
-//	@return: bool true - 批量删除成功 | false - 批量删除失败
-func (client *AliOssClient) DeleteMore(ossFilePath []string) bool {
+// DeleteMore 删除文件-多文件删除
+// delete more file in oss
+// params ossPath []string `file oss path array [文件的oss路径数组]`
+// return bool
+func (client *AliOssClient) DeleteMore(ossFilePath []string) (bool, error) {
 	//oss delete more file fun
-	_,err := client.Client.DeleteObjects(ossFilePath)
+	_, err := client.Client.DeleteObjects(ossFilePath)

 	if err != nil {
-		panic("delete more file in oss failed:" + err.Error())
+		return false, errors.New("delete more file in oss failed:" + err.Error())
 	}

-	return true
+	return true, nil
 }

-
-//	@method: GetTemporaryUrl
-//	@description: 获取文件临时地址
-//	@author: mr.x 2021-06-19 00:31:34
-//	@param: path string 文件路径【段路径】
-//	@param: expireInSecond int64 有效时间 秒 默认 60S
-//	@return: string
-func (client *AliOssClient) GetTemporaryUrl(path string,expireInSecond int64) string {
+// GetTemporaryUrl 获取文件临时地址
+// path string 文件路径
+// expireInSecond int64 多久后过期 单位: 秒，默认 60
+func (client *AliOssClient) GetTemporaryUrl(path string, expireInSecond int64) (string, error) {

 	var expireTime int64

@@ -140,12 +129,12 @@ func (client *AliOssClient) GetTemporaryUrl(path string,expireInSecond int64) st
 		expireTime = expireInSecond
 	}

-	signUrl,err := client.Client.SignURL(path,oss.HTTPGet,expireTime)
+	signUrl, err := client.Client.SignURL(path, oss.HTTPGet, expireTime)

 	if err != nil {
-		panic("generate sign url failed:" + err.Error())
+		return "", errors.New("generate sign url failed:" + err.Error())
 	}

-	return signUrl
+	return signUrl, nil

-}
+}
--- a/oss_test.go
+++ b/oss_test.go
@@ -7,51 +7,49 @@ import (
 	"testing"
 )

-func TestPut(t *testing.T)  {
+func TestPut(t *testing.T) {
 	ossConfig := &AliOssConfig{
-		EndPoint: "",
-		AccessKeyId: "",
+		EndPoint:        "",
+		AccessKeyId:     "",
 		AccessKeySecret: "",
-		BucketName: "",
+		BucketName:      "",
 	}

 	client := ossConfig.CreateOssConnect()

-	uri := client.Put("logo/","./File/3HaqWaOzJWD86DDvZD9Pmn9VUEOBOBbuWackGOXb (2).jpeg",".png")
+	uri := client.Put("logo/", "./File/3HaqWaOzJWD86DDvZD9Pmn9VUEOBOBbuWackGOXb (2).jpeg", ".png")

 	fmt.Println(uri)
 }

-func TestPutBase64(t *testing.T)  {
+func TestPutBase64(t *testing.T) {
 	ossConfig := &AliOssConfig{
-		EndPoint: "",
-		AccessKeyId: "",
+		EndPoint:        "",
+		AccessKeyId:     "",
 		AccessKeySecret: "",
-		BucketName: "",
+		BucketName:      "",
 	}

 	client := ossConfig.CreateOssConnect()

 	// 读取base
-	file,_ := ioutil.ReadFile("./File/3HaqWaOzJWD86DDvZD9Pmn9VUEOBOBbuWackGOXb (2).jpeg")
-
+	file, _ := ioutil.ReadFile("./File/3HaqWaOzJWD86DDvZD9Pmn9VUEOBOBbuWackGOXb (2).jpeg")

 	fileStr := base64.StdEncoding.EncodeToString(file)

-	bat,_ := base64.StdEncoding.DecodeString(fileStr)
+	bat, _ := base64.StdEncoding.DecodeString(fileStr)

-
-	uri := client.Put("logo/",bat,".png")
+	uri := client.Put("logo/", bat, ".png")
 	//
 	fmt.Println(uri)
 }

-func TestExists(t *testing.T)  {
+func TestExists(t *testing.T) {
 	ossConfig := &AliOssConfig{
-		EndPoint: "oss-cn-shenzhen.aliyuncs.com",
-		AccessKeyId: "",
+		EndPoint:        "oss-cn-shenzhen.aliyuncs.com",
+		AccessKeyId:     "",
 		AccessKeySecret: "",
-		BucketName: "",
+		BucketName:      "",
 	}

 	client := ossConfig.CreateOssConnect()
@@ -63,10 +61,10 @@ func TestExists(t *testing.T)  {

 func TestDelete(t *testing.T) {
 	ossConfig := &AliOssConfig{
-		EndPoint: "oss-cn-shenzhen.aliyuncs.com",
-		AccessKeyId: "",
+		EndPoint:        "oss-cn-shenzhen.aliyuncs.com",
+		AccessKeyId:     "",
 		AccessKeySecret: "",
-		BucketName: "",
+		BucketName:      "",
 	}

 	client := ossConfig.CreateOssConnect()
@@ -78,10 +76,10 @@ func TestDelete(t *testing.T) {

 func TestAliOssClient_DeleteMore(t *testing.T) {
 	ossConfig := &AliOssConfig{
-		EndPoint: "oss-cn-shenzhen.aliyuncs.com",
-		AccessKeyId: "",
+		EndPoint:        "oss-cn-shenzhen.aliyuncs.com",
+		AccessKeyId:     "",
 		AccessKeySecret: "",
-		BucketName: "",
+		BucketName:      "",
 	}

 	client := ossConfig.CreateOssConnect()
@@ -96,16 +94,15 @@ func TestAliOssClient_DeleteMore(t *testing.T) {

 func TestAliOssClient_GetTemporaryUrl(t *testing.T) {
 	ossConfig := &AliOssConfig{
-		EndPoint: "",
-		AccessKeyId: "",
+		EndPoint:        "https://oss-cn-hangzhou.aliyuncs.com",
+		AccessKeyId:     "",
 		AccessKeySecret: "",
-		BucketName: "",
+		BucketName:      "",
 	}

 	client := ossConfig.CreateOssConnect()

-	singUrl := client.GetTemporaryUrl("logo/8497b913-2a79-58a1-984b-c25827f8212e.png",180)
+	singUrl := client.GetTemporaryUrl("", 180)

 	fmt.Println(singUrl)
 }
-
Author	SHA1	Message	Date
coward	97911ec21d	:arrow_up:升级uuid依赖	2024-03-07 11:01:37 +08:00
coward	aa203fcf61	:zap:优化	2023-02-27 15:25:33 +08:00
coward	c00770cab3	:arrow_up:升级了oss依赖	2022-09-02 10:07:54 +08:00