wip:上传附件ossid

rpc/partnerlib/service/docDownload.go

@@ -48,10 +48,11 @@ func DocDownload(in *partnerlib.UserDownloadRequest) (res *partnerlib.UDRes, err
 				if res.OssDocId = docInfo.OssDocId; res.OssDocId != "" {
 					return
 				}
+				fileId := util.GetHashKey(b)
 				//获取附件后上传oss
 				fileRes := FileUpload(&filesystem.SaveFileReq{
 					Domain: IC.C.OssInfo.BucketName,
-					FileId: fmt.Sprintf("%s.%s", util.GetHashKey(b), docInfo.DocFileSuffix),
+					FileId: fmt.Sprintf("%s.%s", fileId, docInfo.DocFileSuffix),
 					Meta: map[string]string{
 						"docName":   docInfo.DocName,
 						"docSuffix": docInfo.DocFileSuffix,
@@ -59,9 +60,10 @@ func DocDownload(in *partnerlib.UserDownloadRequest) (res *partnerlib.UDRes, err
 					},
 					RawFileContent: b,
 				})
-				if res.OssDocId = fileRes.OssDocId; res.OssDocId != "" {
+				if fileRes.OssDocId != "" {
+					res.OssDocId = fileId
 					//更新doc
-					if errUpdate := partner.DocsUpdate(0, model.Doc{OssDocId: res.OssDocId}); errUpdate != nil {
+					if errUpdate := partner.DocsUpdate(0, model.Doc{Id: in.DocId, OssDocId: res.OssDocId}); errUpdate != nil {
 						warn.SendMsgByWXURL(fmt.Sprintf("文档id：%s,文档名称：%s 上传tidb doc 异常：%s", docInfo.Id, docInfo.DocName, err.Error()))
 					}
 					return

rpc/partnerlib/service/ossFileUpload.go

@@ -9,7 +9,7 @@ import (
 )
 
 // 上传文档信息
-func FileUpload(fr *filesystem.SaveFileReq) (res *partnerlib.UDRes) {
+func FileUpload(fr *filesystem.SaveFileReq) (res partnerlib.UDRes) {
 	if fr != nil && len(fr.RawFileContent) > 0 {
 		fRes, err := jyDocRpcUtil.FileSystem.SaveFile(gctx.New(), fr)
 		if err == nil && fRes.State {

rpc/partnerlib/util/util.go

@@ -3,18 +3,20 @@ package util
 import (
 	"app.yhyue.com/moapp/jybase/common"
 	"app.yhyue.com/moapp/jypkg/common/src/qfw/util/jy"
-	"crypto/sha256"
-	"fmt"
+	"crypto/md5"
+	"encoding/hex"
 )
 
 // sha1 加密
 func GetHashKey(bs []byte) string {
 	defer common.Catch()
-	ha := sha256.New()
-	ha.Write(bs)
-	hbs := ha.Sum(nil)
-	key := fmt.Sprintf("%x", hbs)
-	return key
+	//ha := sha256.New()
+	//ha.Write(bs)
+	//hbs := ha.Sum(nil)
+	//key := fmt.Sprintf("%x", hbs)
+	//return key
+	hash := md5.Sum(bs)
+	return hex.EncodeToString(hash[:])
 }
 
 // 创建订单号