'更改了注释'

2021-06-19 00:32:52 +08:00
6 changed files with 131 additions and 109 deletions
--- a/file.go
+++ b/file.go
@@ -1,7 +1,6 @@
 package go_aliyun_oss

 import (
-	"errors"
 	"fmt"
 	uuid "github.com/satori/go.uuid"
 	"io/ioutil"
@@ -25,8 +24,11 @@ type OssFileInterface interface {
 	GetFileType() *OssFile
 }

-// FileTypeTransForm file type transform
-// @title 文件类型转换
+//	@method: FileTypeTransForm
+//	@description: 文件类型转换
+//	@author: mr.x 2021-06-19 00:28:46
+//	@return: *OssFile
+//	@return: error
 func (ossFile *OssFile) FileTypeTransForm() (*OssFile,error) {
 	var err error

@@ -36,7 +38,7 @@ func (ossFile *OssFile) FileTypeTransForm() (*OssFile, error) {
 		ossFile.FileByte,err = ioutil.ReadAll(ossFile.File.(*os.File))

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

 		_,ossFile.FileOldName = filepath.Split(ossFile.File.(*os.File).Name())
@@ -56,7 +58,7 @@ func (ossFile *OssFile) FileTypeTransForm() (*OssFile, error) {
 		ossFile.FileByte,err = ioutil.ReadAll(fileResources)

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

 		ossFile.FileOldName = ossFile.File.(*multipart.FileHeader).Filename
@@ -67,7 +69,7 @@ func (ossFile *OssFile) FileTypeTransForm() (*OssFile, error) {
 		newFile,err := os.Open(ossFile.File.(string))

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

 		defer newFile.Close()
@@ -93,7 +95,7 @@ func (ossFile *OssFile) FileTypeTransForm() (*OssFile, error) {

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

 	ossFile.GetFileType()
@@ -101,8 +103,10 @@ func (ossFile *OssFile) FileTypeTransForm() (*OssFile, error) {
 	return ossFile,nil
 }

-// GetFileType split file type and generate file name
-// 截取文件类型
+//	@method: GetFileType
+//	@description: 截取文件类型
+//	@author: mr.x 2021-06-19 00:28:52
+//	@return: *OssFile
 func (ossFile *OssFile) GetFileType() *OssFile {

 	// 当没有传递文件类型时去文件名中截取出文件类型
--- a/go.mod
+++ b/go.mod
@@ -3,7 +3,7 @@ module github.com/cowardmrx/go_aliyun_oss
 go 1.15

 require (
-	github.com/aliyun/aliyun-oss-go-sdk v2.2.5+incompatible
+	github.com/aliyun/aliyun-oss-go-sdk v2.1.5+incompatible
 	github.com/baiyubin/aliyun-sts-go-sdk v0.0.0-20180326062324-cfa1a18b161f // indirect
 	github.com/satori/go.uuid v1.2.0
 	golang.org/x/time v0.0.0-20200630173020-3af7569d3a1e // indirect
--- a/go.sum
+++ b/go.sum
@@ -1,7 +1,5 @@
 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/kr/pretty v0.2.1 h1:Fmg33tUaq4/8ym9TJN1x7sLJnHVwhP33CNkpYV/7rwI=
--- a/oss_client.go
+++ b/oss_client.go
@@ -20,7 +20,9 @@ type AliOssConfigInterface interface {
 	GetAccessibleUrl() string
 }

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

 }

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

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

--- a/oss_operation.go
+++ b/oss_operation.go
@@ -2,7 +2,6 @@ package go_aliyun_oss

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

@@ -19,11 +18,15 @@ type ossResponse struct {
 	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{}, fileType string) (*ossResponse, error) {
+
+//	@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 {
 	//file to []byte
 	//文件转字节流
 	uploadFile := &OssFile{
@@ -34,7 +37,7 @@ func (client *AliOssClient) Put(ossDir string, file interface{}, fileType string
 	ossFile,err := uploadFile.FileTypeTransForm()

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

 	// 最终的oss名称
@@ -59,7 +62,7 @@ func (client *AliOssClient) Put(ossDir string, file interface{}, fileType string
 	err = client.Client.PutObject(ossPath,bytes.NewReader(ossFile.FileByte))

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

 	return &ossResponse{
@@ -67,59 +70,67 @@ func (client *AliOssClient) Put(ossDir string, file interface{}, fileType string
 		LongPath: client.Domain + "/" + ossPath,
 		ShortPath: ossPath,
 		FileName: ossFileName,
-	}, nil
+	}
 }

-// HasExists 校验文件是否已经存在
-// check file already exists in oss server
-// params: ossFilePath	string 	`file oss path [文件的oss的路径]`
-func (client *AliOssClient) HasExists(ossFilePath string) (bool, error) {
+//	@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 {

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

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

-	return isExists, nil
+	return isExists
 }

-// Delete 删除文件-单文件删除
-// delete one file in oss
-// params ossPath string `file oss path [文件的oss路径]`
-// return bool
-func (client *AliOssClient) Delete(ossFilePath string) (bool, error) {
+//	@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 {

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

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

-	return true, nil
+	return true
 }

-// DeleteMore 删除文件-多文件删除
-// delete more file in oss
-// params ossPath []string `file oss path array [文件的oss路径数组]`
-// return bool
-func (client *AliOssClient) DeleteMore(ossFilePath []string) (bool, error) {
+//	@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 {
 	//oss delete more file fun
 	_,err := client.Client.DeleteObjects(ossFilePath)

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

-	return true, nil
+	return true
 }

-// GetTemporaryUrl 获取文件临时地址
-// path string 文件路径
-// expireInSecond int64 多久后过期 单位: 秒，默认 60
-func (client *AliOssClient) GetTemporaryUrl(path string, expireInSecond int64) (string, error) {
+
+//	@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 {

 	var expireTime int64

@@ -132,9 +143,9 @@ func (client *AliOssClient) GetTemporaryUrl(path string, expireInSecond int64) (
 	signUrl,err := client.Client.SignURL(path,oss.HTTPGet,expireTime)

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

-	return signUrl, nil
+	return signUrl

 }
--- a/oss_test.go
+++ b/oss_test.go
@@ -35,10 +35,12 @@ func TestPutBase64(t *testing.T) {
 	// 读取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)
@@ -94,7 +96,7 @@ func TestAliOssClient_DeleteMore(t *testing.T) {

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

 	client := ossConfig.CreateOssConnect()

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

 	fmt.Println(singUrl)
 }
+