Merge branch 'feature/v1.0.1' of https://jygit.jydev.jianyu360.cn/moapp/jy_docs into feature/v1.0.1

rpc/partnerlib/service/docDownload.go

@@ -57,14 +57,14 @@ func DocDownload(in *partnerlib.UserDownloadRequest) (res *partnerlib.UDRes, err
 				ossId := fmt.Sprintf("%s.%s", fileId, docInfo.DocFileSuffix)
 				fileUploadCache := fmt.Sprintf("file_upload_ing_%s", ossId)
 				redis.Put(entity.RedisCode, fileUploadCache, ossId, 60*60)
-				go func(_ossId, _fileId, fileUploadCache string, _docInfo *model.Docin) {
+				go func(_ossId, _fileId, _fileUploadCache string, _docInfo *model.Docin, _b []byte) {
 					//并发ing
 					entity.FileUploadChanel <- true
 					defer func() {
 						<-entity.FileUploadChanel
 					}()
 					defer func() {
-						redis.Del(entity.RedisCode, fileUploadCache)
+						redis.Del(entity.RedisCode, _fileUploadCache)
 					}()
 					//获取附件后上传oss
 					fileRes := util.FileUpload(&filesystem.SaveFileReq{
@@ -75,19 +75,19 @@ func DocDownload(in *partnerlib.UserDownloadRequest) (res *partnerlib.UDRes, err
 							"docSuffix": _docInfo.DocFileSuffix,
 							"docSize":   fmt.Sprintf("%d", _docInfo.DocFileSize),
 						},
-						RawFileContent: b,
-						Charset:        util.GetFileChardet(b),
+						RawFileContent: _b,
+						Charset:        util.GetFileChardet(_b),
 					})
 					if fileRes.OssDocId == "" {
 						err = fmt.Errorf("文档上传失败")
 						warn.SendMsgByWXURL(fmt.Sprintf("文档id：%s,文档名称：%s，上传到oss异常：%s", _docInfo.Id, _docInfo.DocName, err.Error()))
 					} else if IC.C.Conversion.Switch && IC.C.Conversion.DocFormat[_docInfo.DocFileSuffix] {
 						//转换pdf
-						if msg := conversion.NewConversion(_docInfo.Id, _docInfo.DocName, _fileId, _docInfo.DocFileSuffix, b, _docInfo.DocFileSize).ToConversion(); msg != "" {
+						if msg := conversion.NewConversion(_docInfo.Id, _docInfo.DocName, _fileId, _docInfo.DocFileSuffix, _b, _docInfo.DocFileSize).ToConversion(); msg != "" {
 							warn.SendMsgByWXURL(fmt.Sprintf("文档 %s--%s 转换 pdf格式异常：%s", _docInfo.Id, _docInfo.DocName, msg))
 						}
 					}
-				}(ossId, fileId, fileUploadCache, docInfo)
+				}(ossId, fileId, fileUploadCache, docInfo, b)
 				//更新doc
 				if errUpdate := partner.DocsUpdate(0, model.Doc{
 					Id:         in.DocId,

rpc/partnerlib/test/fileUpload_test.go

@@ -93,7 +93,7 @@ func Test_GetFile(t *testing.T) {
 	}))
 	resp, err := jyFilelLib.GetOssUril(gctx.New(), &filesystem.LoadFileReq{
 		Domain: Domain,
-		FileId: "dc2687989f5a2c2f91c5a9a40d5ffb29.doc",
+		FileId: "cd9db3aa5bbd66dec7e6d0718855ec64.pptx",
 	})
 	log.Println(resp, "-----", err)
 }

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-3180982172",
+  "docId": "docin-3204148838",
   "state": 1
 }