rpc上传正文

jy_publishing/tool/task.go

@@ -12,13 +12,12 @@ import (
 	jypb "jy_publishing/proto/common"
 	pb "jy_publishing/proto/proto"
 	"jygit.jydev.jianyu360.cn/BP/servicerd/proto"
-	"jygit.jydev.jianyu360.cn/BaseService/ossClient"
-	"jygit.jydev.jianyu360.cn/BaseService/ossClient/entity"
 	util "jygit.jydev.jianyu360.cn/data_processing/common_utils"
 	"jygit.jydev.jianyu360.cn/data_processing/common_utils/mongodb"
 	"jygit.jydev.jianyu360.cn/data_processing/common_utils/udp"
 	"log"
 	"net"
+	"net/rpc"
 	"regexp"
 	"strconv"
 	"strings"
@@ -334,25 +333,23 @@ func InfoPub(info map[string]interface{}) {
 
 	Logger.Debug("InfoPub mgo save: " + fmt.Sprint(saveMap))
 	MgoBid.SaveByOriID(BidColl, saveMap)
-	args := entity.UploadArgs{
-		BucketID:   Detail_BucketId,
-		ObjectName: fmt.Sprintf("%s.txt", _id),
+	err := OssUpRpc(UploadArgs{
+		Stream:     []byte(util.ObjToString(tmp["detail"])),
 		Gzip:       false,
-		Stream:     []byte(cut),
-	}
-	res := ossClient.UpLoadByRestful(Oss_Server_Address, &args)
-	if res.Error_code != 0 {
-		log.Println("RepairPub", _id, "上传 OSS detail  失败", res)
-	}
-	args1 := entity.UploadArgs{
 		BucketID:   Contenthtml_BucketId,
-		ObjectName: fmt.Sprintf("%s.txt", _id),
-		Gzip:       false,
-		Stream:     []byte(util.ObjToString(tmp["detail"])),
+		ObjectName: fmt.Sprintf("%s.txt", mongodb.BsonIdToSId(_id)),
+	})
+	if err != nil {
+		Logger.Error("InfoPub oss upload: " + err.Error())
 	}
-	res1 := ossClient.UpLoadByRestful(Oss_Server_Address, &args1)
-	if res.Error_code != 0 {
-		log.Println("RepairPub", _id, "上传 OSS contenthtml 失败", res1)
+	err = OssUpRpc(UploadArgs{
+		Stream:     []byte(cut),
+		Gzip:       false,
+		BucketID:   Detail_BucketId,
+		ObjectName: fmt.Sprintf("%s.txt", mongodb.BsonIdToSId(_id)),
+	})
+	if err != nil {
+		Logger.Error("InfoPub oss upload: " + err.Error())
 	}
 }
 
@@ -522,3 +519,24 @@ func Sha(con string) string {
 	h.Write([]byte(con))
 	return fmt.Sprintf("%x", h.Sum(nil))
 }
+
+type UploadArgs struct {
+	Stream     []byte // 客户端将文件数据传递过来
+	Gzip       bool   //是否压缩
+	BucketID   string //桶id
+	ObjectName string //对象名称
+}
+
+func OssUpRpc(req UploadArgs) error {
+	client, err := rpc.DialHTTP("tcp", Oss_Server_Address)
+	defer client.Close()
+	if err != nil {
+		return err
+	}
+	var resp = make(map[string]bool)
+	if err = client.Call("OSSService.Upload", req, &resp); err != nil {
+		log.Println("OSSService.Upload", "err", err.Error())
+		return err
+	}
+	return nil
+}