wip:附件上传

rpc/partnerlib/service/docDownload.go

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

rpc/partnerlib/test/fileUpload_test.go

@@ -0,0 +1,55 @@
+package test
+
+import (
+	"app.yhyue.com/moapp/jyfs/rpc/filesystem"
+	"app.yhyue.com/moapp/jyfs/rpc/filesystemclient"
+	"fmt"
+	"github.com/gogf/gf/v2/os/gctx"
+	"github.com/zeromicro/go-zero/core/discov"
+	"github.com/zeromicro/go-zero/zrpc"
+	"log"
+	"testing"
+)
+
+var (
+	Domain = "jydocs-std"
+)
+
+func Test_FileUpload(t *testing.T) {
+	log.Println("-------------")
+	//获取附件后上传oss
+	fr := &filesystem.SaveFileReq{
+		Domain: Domain,
+		FileId: fmt.Sprintf("%s.%s", "101010", "doc"),
+		Meta: map[string]string{
+			"docName":   "101020",
+			"docSuffix": "doc",
+			"docSize":   "24",
+		},
+		RawFileContent: []byte("我是中国人"),
+	}
+	if fr != nil && len(fr.RawFileContent) > 0 {
+		jyFilelLib := filesystemclient.NewFileSystem(zrpc.MustNewClient(zrpc.RpcClientConf{
+			Etcd: discov.EtcdConf{
+				Key:   "moapp.filesystem.rpc",
+				Hosts: []string{"192.168.3.206:2379"},
+			},
+		}))
+		fRes, err := jyFilelLib.SaveFile(gctx.New(), fr)
+		log.Println(fRes, "----------", err)
+	}
+}
+
+func Test_GetFile(t *testing.T) {
+	jyFilelLib := filesystemclient.NewFileSystem(zrpc.MustNewClient(zrpc.RpcClientConf{
+		Etcd: discov.EtcdConf{
+			Key:   "moapp.filesystem.rpc",
+			Hosts: []string{"192.168.3.206:2379"},
+		},
+	}))
+	resp, err := jyFilelLib.GetOssUril(gctx.New(), &filesystem.LoadFileReq{
+		Domain: Domain,
+		FileId: "e7808fb6ac51bce32d9131248850a5fb.doc",
+	})
+	log.Println(resp, "-----", err)
+}

services/partner/docsUpdate.go

@@ -13,6 +13,8 @@ func DocsUpdate(state int, doc model.Doc) (err error) {
 	switch state {
 	case 0:
 		updateMap["ossDocId"] = doc.OssDocId
+		updateMap["ossPdfId"] = doc.OssPdfId
+		updateMap["ossTxtId"] = doc.OssTxtId
 	case 1:
 		updateMap["price"] = doc.Price
 		updateMap["productType"] = doc.ProductType