wip:豆丁txt 上传格式异常处理

go.mod

@@ -6,7 +6,7 @@ toolchain go1.22.4
 
 require (
 	app.yhyue.com/moapp/jybase v0.0.0-20240523083821-42a82b37ae20
-	app.yhyue.com/moapp/jyfs v0.0.0-20231024061508-480c270480d4
+	app.yhyue.com/moapp/jyfs v0.0.0-20240620115525-f330ca6510bd
 	app.yhyue.com/moapp/jypkg v1.21.4
 	github.com/gogf/gf/v2 v2.7.1
 	github.com/zeromicro/go-zero v1.6.4

go.sum

@@ -17,8 +17,9 @@ app.yhyue.com/moapp/jybase v0.0.0-20230901064756-2fc66b18db40/go.mod h1:Hv9U/7oH
 app.yhyue.com/moapp/jybase v0.0.0-20231025021840-2f91c944ecdd/go.mod h1:Hv9U/7oHRucqH315Tr1+d03NCvS9mOKPfk8pwwlOIwQ=
 app.yhyue.com/moapp/jybase v0.0.0-20240523083821-42a82b37ae20 h1:F1ZHkzo7yHp5eNrZDqQxaXMIKFQU72bsI1dMq3ztJLA=
 app.yhyue.com/moapp/jybase v0.0.0-20240523083821-42a82b37ae20/go.mod h1:XHNATN6tsJKHdCB0DbUtFdPPHXexTUFyB3RlO+lUUoM=
-app.yhyue.com/moapp/jyfs v0.0.0-20231024061508-480c270480d4 h1:5oCyV5lZ65iYTx0jts6qsrM8xTc2dbEnVd7qqnUzfy0=
 app.yhyue.com/moapp/jyfs v0.0.0-20231024061508-480c270480d4/go.mod h1:61hzZ3dZHXL28BNl8BOgZsvM2S5UVY5YFzOkEUPrSu4=
+app.yhyue.com/moapp/jyfs v0.0.0-20240620115525-f330ca6510bd h1:vOltixTxJDEZson0cLv/39Y/Z7jJerXOPWmHxgO7F+Y=
+app.yhyue.com/moapp/jyfs v0.0.0-20240620115525-f330ca6510bd/go.mod h1:61hzZ3dZHXL28BNl8BOgZsvM2S5UVY5YFzOkEUPrSu4=
 app.yhyue.com/moapp/jypkg v1.21.4 h1:NApb2EOlUkncX9yjMjKDFyOXKK66vOMJ3HprzMx8alc=
 app.yhyue.com/moapp/jypkg v1.21.4/go.mod h1:wyJeNc8I9R5799tqch7n8SEZrB0s8nmNou0brBh91w4=
 app.yhyue.com/moapp/message v0.0.0-20231204024949-8c7145bfc161 h1:WGi4OEIoqw6NpNFGioUEBZnjK9aBa+xJqf/5WY+QyhM=

rpc/partnerlib/service/docDownload.go

@@ -75,6 +75,7 @@ func DocDownload(in *partnerlib.UserDownloadRequest) (res *partnerlib.UDRes, err
 							"docSize":   fmt.Sprintf("%d", _docInfo.DocFileSize),
 						},
 						RawFileContent: b,
+						Source:         "docin",
 					})
 					if fileRes.OssDocId == "" {
 						err = fmt.Errorf("文档上传失败")

rpc/partnerlib/test/1.txt

@@ -0,0 +1,6 @@
+这里是剑鱼
+概述
+在商业竞争激烈的市场环境中，恶意低价中标成为一种常见的手段。企业需要采取相应的措施来防止恶意低价中标，保护自身的利益和声誉。本文将介绍一些有效的方法来应对该问题。
+
+了解恶意低价中标的危害
+恶意低价中标是指一些企业故意以低于成本的价格中标，以获取项目或订单，并通过其他途径实施变相加价，最终获得利润。这种行为对正常竞争秩序和市场环境产生负面影响，对一家企业的经济利益和品牌形象造成严重损害。了解恶意低价中标的危害是制定防范措施的基础。

rpc/partnerlib/test/2.txt

@@ -0,0 +1,13 @@
+永康plc培训 三菱西门子 18057973905 层峰自动化 一对一随到随学
+1三菱FX系列PLC编辑课程
+2三菱FX系列PLC编程+触摸屏+伺服+步进+变频器综合课程
+3西门子S7-200PLC系列编辑课程
+4西门子S7-200SMART PLC系列编程+触摸屏+伺服+步进+变频器综合课程
+5西门子S7-300/400/1200/1500系统课程
+6维纶触摸屏应用课程
+7伺服精确定位+步进驱动课程+变频调速
+8三菱FX系列PLC编程入门
+9西门子S7-200PLC编程入门
+10 工业机器人课程
+11 视觉系统课程
+12 机械制图Solidworks设计培训

rpc/partnerlib/test/fileUpload_test.go

@@ -3,12 +3,15 @@ package test
 import (
 	"app.yhyue.com/moapp/jyfs/rpc/filesystem"
 	"app.yhyue.com/moapp/jyfs/rpc/filesystemclient"
+	"bytes"
+	"compress/gzip"
 	"fmt"
 	"github.com/gogf/gf/v2/os/gctx"
 	"github.com/zeromicro/go-zero/core/discov"
 	"github.com/zeromicro/go-zero/zrpc"
 	"google.golang.org/grpc"
 	"log"
+	"os"
 	"testing"
 )
 
@@ -18,22 +21,41 @@ var (
 
 func Test_FileUpload(t *testing.T) {
 	log.Println("-------------")
+	file, err := os.Open("./2.txt")
+	if err != nil {
+		return
+	}
+	defer file.Close()
+	// FileInfo:
+	stats, err := file.Stat()
+	if err != nil {
+		return
+	}
+	// []byte
+	data := make([]byte, stats.Size())
+	count, err := file.Read(data)
+	if err != nil {
+		return
+	}
+	log.Println(count)
+	suffix := "txt"
 	//获取附件后上传oss
 	fr := &filesystem.SaveFileReq{
 		Domain: Domain,
-		FileId: fmt.Sprintf("%s.%s", "101010", "doc"),
+		FileId: fmt.Sprintf("%s.%s", "101010003", suffix),
 		Meta: map[string]string{
-			"docName":   "101020",
-			"docSuffix": "doc",
-			"docSize":   "24",
+			"docName":   "101010003",
+			"docSuffix": suffix,
+			"docSize":   "1024",
 		},
-		RawFileContent: []byte("我是中国人"),
+		RawFileContent: CompressWithGzip(data),
+		Source:         "docin",
 	}
 	if fr != nil && len(fr.RawFileContent) > 0 {
 		conf := zrpc.RpcClientConf{
 			Etcd: discov.EtcdConf{
 				Key:   "moapp.filesystem.rpc",
-				Hosts: []string{"192.168.3.206:2379"},
+				Hosts: []string{"127.0.0.1:2379"},
 			},
 		}
 		grpcOpts := []zrpc.ClientOption{
@@ -53,12 +75,24 @@ 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"},
+			Hosts: []string{"127.0.0.1:2379"},
 		},
 	}))
 	resp, err := jyFilelLib.GetOssUril(gctx.New(), &filesystem.LoadFileReq{
 		Domain: Domain,
-		FileId: "335a98b93b81dd3a0488a1eecac55d4a.pdf",
+		FileId: "101010003.txt",
 	})
 	log.Println(resp, "-----", err)
 }
+
+func CompressWithGzip(data []byte) []byte {
+	var buf bytes.Buffer
+	gzipW := gzip.NewWriter(&buf)
+	if _, err := gzipW.Write(data); err != nil {
+		return nil
+	}
+	if err := gzipW.Close(); err != nil {
+		return nil
+	}
+	return buf.Bytes()
+}

rpc/partnerlib/test/partner_test.http

@@ -6,7 +6,7 @@ GRPC 127.0.0.1:8087/partnerlib.Partner/DocDownload
   "mgoUserId": "65781a99e994f1ed2bf3f361",
   "positionId": 1205591416,
   "phone": "18238182402",
-  "docId": "docin-3176669582",
+  "docId": "docin-3177809738",
   "state": 1
 }