oss附件更新

src/main.go

@@ -20,7 +20,6 @@ func init() {
 	util.InitMgoPool()             //初始化连接
 	util.InitOther()
 	util.InitUdp()
-	util.InitOss()
 	//xweb框架配置
 	xweb.Config.RecoverPanic = true
 	xweb.Config.Profiler = true

src/service/repair_service.go

@@ -36,8 +36,6 @@ var (
 	rpre2         = regexp.MustCompile("https://www.jianyu360.cn/article/mailprivate/")
 	rsuf          = regexp.MustCompile("(.html).*")
 	AddSpiderCode = "sdxzbiddingsjzypc" // 新增bidding数据spider_code
-	//domain        = "http://172.31.31.203:1111" //测试环境oss
-	domain = "http://172.17.162.27:18011" //正式环境 oss
 )
 
 type RepairRule struct {
@@ -165,13 +163,12 @@ func (jy *RepairRule) RepairNewSave() {
 	//OSS 上传
 	if detail != "" {
 		args := ossutil.UploadArgs{
-			BucketID:   "detail",
+			BucketID:   Detail_BucketId,
 			ObjectName: fmt.Sprintf("%s.txt", id),
 			Gzip:       false,
 			Stream:     []byte(detail),
 		}
-		//OssPutObject(OssBucketNameDetail, id, []byte(detail))
-		res := ossutil.UpLoadByRestful(domain, &args)
+		res := ossutil.UpLoadByRestful(Oss_Server_Address, &args)
 		if res.Error_code != 0 {
 			log.Println("RepairPub", id, "上传 OSS detail  失败", res)
 		}
@@ -187,13 +184,12 @@ func (jy *RepairRule) RepairNewSave() {
 
 	if contenthtml != "" {
 		args := ossutil.UploadArgs{
-			BucketID:   "contenthtml",
+			BucketID:   Contenthtml_BucketId,
 			ObjectName: fmt.Sprintf("%s.txt", id),
 			Gzip:       false,
 			Stream:     []byte(contenthtml),
 		}
-		//OssPutObject(OssBucketNameDetail, id, []byte(detail))
-		res := ossutil.UpLoadByRestful(domain, &args)
+		res := ossutil.UpLoadByRestful(Oss_Server_Address, &args)
 		if res.Error_code != 0 {
 			log.Println("RepairPub", id, "上传 OSS contenthtml 失败", res)
 		}
@@ -221,8 +217,25 @@ func (jy *RepairRule) RepairNewSave() {
 	_, _ = spiderutil.AddBloomRedis("detail", spiderutil.FilterDetail(detail))
 	//PutRedis("title_repeat_listpagehref", 0, href, "", 3600*24*30*24)                               // 列表页增量redis
 	if b {
-		OssPutObject(OssBucketNameDetail, id, []byte(detail))
-		OssPutObject(OssBucketNameContenthtml, id, []byte(contenthtml))
+		args_detail := &ossutil.UploadArgs{
+			BucketID:   Detail_BucketId,
+			ObjectName: fmt.Sprintf("%s.txt", id),
+			Stream:     []byte(detail),
+		}
+		res := ossutil.UpLoadByRestful(Oss_Server_Address, args_detail)
+		if res.Error_msg != ossutil.UploadSuccess {
+			log.Println("RepairNewSave", id, "上传 OSS detail  失败", res)
+		}
+		args_html := &ossutil.UploadArgs{
+			BucketID:   Contenthtml_BucketId,
+			ObjectName: fmt.Sprintf("%s.txt", id),
+			Gzip:       false,
+			Stream:     []byte(contenthtml),
+		}
+		res = ossutil.UpLoadByRestful(Oss_Server_Address, args_html)
+		if res.Error_msg != ossutil.UploadSuccess {
+			log.Println("RepairNewSave", id, "上传 OSS contenthtml  失败", res)
+		}
 		log.Println("当前新增id：", id)
 		//日志记录
 		user := jy.GetSession("user").(map[string]interface{})
@@ -357,13 +370,12 @@ func (jy *RepairRule) RepairPub() {
 	if b {
 		if detail := qu.ObjToString(save["detail"]); detail != "" {
 			args := ossutil.UploadArgs{
-				BucketID:   "detail",
+				BucketID:   Detail_BucketId,
 				ObjectName: fmt.Sprintf("%s.txt", id),
 				Gzip:       false,
 				Stream:     []byte(detail),
 			}
-			//OssPutObject(OssBucketNameDetail, id, []byte(detail))
-			res := ossutil.UpLoadByRestful(domain, &args)
+			res := ossutil.UpLoadByRestful(Oss_Server_Address, &args)
 			if res.Error_code != 0 {
 				log.Println("RepairPub", id, "上传 OSS detail  失败", res)
 			}
@@ -381,26 +393,15 @@ func (jy *RepairRule) RepairPub() {
 		//contenthtml  bucket id contenthtml not found
 		if contenthtml := qu.ObjToString(save["contenthtml"]); contenthtml != "" {
 			args := ossutil.UploadArgs{
-				BucketID:   "contenthtml",
+				BucketID:   Contenthtml_BucketId,
 				ObjectName: fmt.Sprintf("%s.txt", id),
 				Gzip:       false,
 				Stream:     []byte(contenthtml),
 			}
-			//OssPutObject(OssBucketNameDetail, id, []byte(detail))
-			res := ossutil.UpLoadByRestful(domain, &args)
+			res := ossutil.UpLoadByRestful(Oss_Server_Address, &args)
 			if res.Error_code != 0 {
 				log.Println("RepairPub", id, "上传 OSS contenthtml 失败", res)
 			}
-
-			//cc_args := ossutil.Args{
-			//	BucketID:   "contenthtml",
-			//	ObjectName: id,
-			//}
-			//dd_cc := ossutil.GetBidDetailByRestful(domain, &cc_args)
-			//
-			//log.Println("contenthtml", dd_cc)
-
-			//OssPutObject(OssBucketNameContenthtml, id, []byte(contenthtml))
 		}
 		// 保存服务
 		href := qu.ObjToString(save["href"])
@@ -771,10 +772,27 @@ func (jy *RepairRule) RepairSave() {
 			})
 		} else {
 			if detail := qu.ObjToString(updata["detail"]); detail != "" {
-				OssPutObject(OssBucketNameDetail, id, []byte(detail))
+				args_detail := &ossutil.UploadArgs{
+					BucketID:   Detail_BucketId,
+					ObjectName: fmt.Sprintf("%s.txt", id),
+					Stream:     []byte(detail),
+				}
+				res := ossutil.UpLoadByRestful(Oss_Server_Address, args_detail)
+				if res.Error_msg != ossutil.UploadSuccess {
+					log.Println("RepairNewSave", id, "上传 OSS detail  失败", res)
+				}
 			}
 			if contenthtml := qu.ObjToString(updata["contenthtml"]); contenthtml != "" {
-				OssPutObject(OssBucketNameContenthtml, id, []byte(contenthtml))
+				args_html := &ossutil.UploadArgs{
+					BucketID:   Contenthtml_BucketId,
+					ObjectName: fmt.Sprintf("%s.txt", id),
+					Gzip:       false,
+					Stream:     []byte(contenthtml),
+				}
+				res := ossutil.UpLoadByRestful(Oss_Server_Address, args_html)
+				if res.Error_msg != ossutil.UploadSuccess {
+					log.Println("RepairNewSave", id, "上传 OSS contenthtml  失败", res)
+				}
 			}
 			//调udp生索引
 			indexNode := *qu.ObjToMap(Sysconfig["indexNode"])
@@ -1618,8 +1636,13 @@ func (jy *RepairRule) UpFile() {
 				}
 			}
 			key := GetHashKey(bt) + TypeByExt(filename)
-			b, err := OssPutObject(OssBucketNameFile, key, bt)
-			if b {
+			detailArgs := &ossutil.UploadArgs{
+				BucketID:   File_BucketId,
+				ObjectName: key,
+				Stream:     bt,
+			}
+			rep := ossutil.UpLoadByRestful(Oss_Server_Address, detailArgs)
+			if rep.Error_msg == ossutil.UploadSuccess {
 				tmp := make(map[string]interface{})
 				tmp["org_url"] = download
 				tmp["filename"] = filename

src/util/ossclient.go

@@ -2,77 +2,19 @@
 package util
 
 import (
-	"bytes"
 	"crypto/sha256"
 	"fmt"
-	"github.com/aliyun/aliyun-oss-go-sdk/oss"
-	"io/ioutil"
-	"os"
 	"qfw/util"
 )
 
 var (
-	ossEndpoint              = "oss-cn-beijing-internal.aliyuncs.com" //正式环境用：oss-cn-beijing-internal.aliyuncs.com 测试：oss-cn-beijing.aliyuncs.com
-	ossAccessKeyId           = "LTAI4G5x9aoZx8dDamQ7vfZi"
-	ossAccessKeySecret       = "Bk98FsbPYXcJe72n1bG3Ssf73acuNh"
-	ossclient                *oss.Client
-	OssBucketNameFile        = "jy-datafile"   //jy-datafile
-	OssBucketNameDetail      = "jy-datadetail" //jy-datadetail
-	OssBucketNameContenthtml = "jy-datahtml"   //jy-datahtml
+	//domain        = "http://172.31.31.203:1111" //测试环境oss
+	Oss_Server_Address   = "http://172.17.162.27:18011" //正式环境 oss
+	File_BucketId        = "file"
+	Detail_BucketId      = "detail"
+	Contenthtml_BucketId = "contenthtml"
 )
 
-func InitOss() {
-	client, err := oss.New(ossEndpoint, ossAccessKeyId, ossAccessKeySecret)
-	if err != nil {
-		fmt.Println("Error:", err)
-		os.Exit(-1)
-	}
-	ossclient = client
-}
-
-// OssPutObject oss附件上传
-func OssPutObject(bucketName, objectKey string, text []byte) (bool, error) {
-	util.Catch()
-	// 获取存储空间。
-	bucket, err := ossclient.Bucket(bucketName)
-	if err != nil {
-		fmt.Println("Error:", err)
-		return false, err
-	}
-	// 上传文件流。
-	err = bucket.PutObject(objectKey, bytes.NewBuffer(text))
-	if err != nil {
-		fmt.Println("Error:", err)
-		return false, err
-	}
-
-	return true, nil
-}
-
-func OssGetObject(bucketName, objectKey string) string {
-	util.Catch()
-	// 获取存储空间。
-	bucket, err := ossclient.Bucket(bucketName)
-	if err != nil {
-		fmt.Println("Error:", err)
-		return ""
-	}
-
-	// 下载文件到流。
-	body, err := bucket.GetObject(objectKey)
-	if err != nil {
-		fmt.Println("Error:", err)
-		return ""
-	}
-	defer body.Close()
-	data, err := ioutil.ReadAll(body)
-	if err != nil {
-		fmt.Println("Error:", err)
-		return ""
-	}
-	return string(data)
-}
-
 func GetHashKey(bs []byte) string {
 	util.Catch()
 	ha := sha256.New()