阿里云改成配置

services/oss.go

@@ -1,6 +1,7 @@
 package services
 
 import (
+	"errors"
 	"github.com/aliyun/aliyun-oss-go-sdk/oss"
 	"os"
 	"time"
@@ -26,49 +27,51 @@ func init() {
 }
 */
 
-//图片上传到阿里云
-func UploadAliyun(filename, filepath string) (string,error) {
+// 图片上传到阿里云
+func UploadAliyun(filename, filepath string) (string, error) {
 	client, err := oss.New(utils.Endpoint, utils.AccessKeyId, utils.AccessKeySecret)
 	if err != nil {
-		return "1",err
+		return "1", err
 	}
 	bucket, err := client.Bucket(utils.Bucketname)
 	if err != nil {
-		return "2",err
+		return "2", err
 	}
 	path := utils.Upload_dir + time.Now().Format("200601/20060102/")
 	path += filename
 	err = bucket.PutObjectFromFile(path, filepath)
 	if err != nil {
-		return "3",err
+		return "3", err
 	}
 	path = utils.Imghost + path
-	return path,err
+	return path, err
 }
 
-
-//音频上传到阿里云
-func UploadAudioAliyun(filename, filepath string) (string,error) {
+// 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
+		return "1", err
 	}
 	bucket, err := client.Bucket(utils.Bucketname)
 	if err != nil {
-		return "2",err
+		return "2", err
 	}
 	path := utils.Upload_Audio_Dir + time.Now().Format("200601/20060102/")
 	path += filename
 	err = bucket.PutObjectFromFile(path, filepath)
 	if err != nil {
-		return "3",err
+		return "3", err
 	}
 	path = utils.Imghost + path
-	return path,err
+	return path, err
 }
 
-//视频上传到阿里云
-func UploadVideoAliyun(filename, filepath,savePath string) (error) {
+// 视频上传到阿里云
+func UploadVideoAliyun(filename, filepath, savePath string) error {
 	defer func() {
 		os.Remove(filepath)
 	}()
@@ -89,4 +92,4 @@ func UploadVideoAliyun(filename, filepath,savePath string) (error) {
 	//path = utils.Imghost + path
 	//return path,err
 	return err
-}
+}

utils/config.go

@@ -46,7 +46,7 @@ var (
 )
 
 // oss配置
-var (
+/*var (
 	Bucketname       string = "hongze"
 	Endpoint         string
 	Imghost          string = "https://hongze.oss-accelerate.aliyuncs.com/"
@@ -55,6 +55,17 @@ var (
 
 	AccessKeyId     string = "LTAIFMZYQhS2BTvW"
 	AccessKeySecret string = "12kk1ptCHoGWedhBnKRVW5hRJzq9Fq"
+)*/
+
+// 阿里云配置
+var (
+	Bucketname       string
+	Endpoint         string
+	Imghost          string
+	UploadDir        string
+	Upload_Audio_Dir string
+	AccessKeyId      string
+	AccessKeySecret  string
 )
 
 // ES配置
@@ -225,6 +236,22 @@ ZwIDAQAB
 		EsEnglishReportIndexName = config["es_english_report_index_name"]
 	}
 
+	// 科大讯飞
+	{
+		XfHostUrl = config["xf_host_url"]
+	}
+
+	// OSS相关
+	{
+		Endpoint = config["endpoint"]
+		Bucketname = config["bucket_name"]
+		Imghost = config["img_host"]
+		UploadDir = config["upload_dir"]
+		Upload_Audio_Dir = config["upload_audio_dir"]
+		AccessKeyId = config["access_key_id"]
+		AccessKeySecret = config["access_key_secret"]
+	}
+
 	// 进门财经开放api配置
 	ComeinOpenApiConfig()
 }