Merge branch 'bugfix_11/23'

services/oss.go

@@ -52,6 +52,9 @@ func UploadAliyun(filename, filepath string) (string, error) {
 
 // UploadAliyunV2 图片上传到阿里云
 func UploadAliyunV2(filename, filepath string) (string, error) {
+	if utils.AccessKeyId == `` {
+		return "0", errors.New("阿里云信息未配置")
+	}
 	client, err := oss.New(utils.Endpoint, utils.AccessKeyId, utils.AccessKeySecret)
 	if err != nil {
 		return "1", err
@@ -70,8 +73,11 @@ func UploadAliyunV2(filename, filepath string) (string, error) {
 	return path, err
 }
 
-// 音频上传到阿里云
+// UploadAudioAliyun 音频上传到阿里云
 func UploadAudioAliyun(filename, filepath string) (string, error) {
+	if utils.AccessKeyId == `` {
+		return "0", errors.New("阿里云信息未配置")
+	}
 	client, err := oss.New(utils.Endpoint, utils.AccessKeyId, utils.AccessKeySecret)
 	if err != nil {
 		return "1", err
@@ -90,8 +96,11 @@ func UploadAudioAliyun(filename, filepath string) (string, error) {
 	return path, err
 }
 
-// 视频上传到阿里云
+// UploadVideoAliyun 视频上传到阿里云
 func UploadVideoAliyun(filename, filepath, savePath string) error {
+	if utils.AccessKeyId == `` {
+		return errors.New("阿里云信息未配置")
+	}
 	defer func() {
 		os.Remove(filepath)
 	}()
@@ -114,21 +123,19 @@ func UploadVideoAliyun(filename, filepath, savePath string) error {
 	return err
 }
 
-const (
-	HzEndpoint          = "oss-cn-shanghai.aliyuncs.com"
-	HzBucketName string = "hzchart"
-)
-
-// 上传文件到阿里云
+// UploadFileToAliyun 上传文件到阿里云
 func UploadFileToAliyun(filename, filepath, savePath string) error {
+	if utils.AccessKeyId == `` {
+		return errors.New("阿里云信息未配置")
+	}
 	defer func() {
 		os.Remove(filepath)
 	}()
-	client, err := oss.New(HzEndpoint, utils.AccessKeyId, utils.AccessKeySecret)
+	client, err := oss.New(utils.Endpoint, utils.AccessKeyId, utils.AccessKeySecret)
 	if err != nil {
 		return err
 	}
-	bucket, err := client.Bucket(HzBucketName)
+	bucket, err := client.Bucket(utils.Bucketname)
 	if err != nil {
 		return err
 	}
@@ -255,6 +262,9 @@ func NewSTSToken() (item *STSToken, err error) {
 
 // UploadAliyunToDir 上传至hzchart
 func UploadAliyunToDir(filename, filepath, uploadDir, fileDir string) (string, error) {
+	if utils.AccessKeyId == `` {
+		return "0", errors.New("阿里云信息未配置")
+	}
 	client, err := oss.New(utils.Endpoint, utils.AccessKeyId, utils.AccessKeySecret)
 	if err != nil {
 		return "1", err