Merge branch 'v1.0.1_ws' of moapp/jy_docs into feature/v1.0.1

rpc/partnerlib/service/docDownload.go

@@ -39,29 +39,31 @@ func DocDownload(in *partnerlib.UserDownloadRequest) (res *partnerlib.UDRes, err
 			docInfo := partner.DocsFindOne(in.DocId)
 			if docInfo.DocName != "" {
 				//查看oss服务器是否已存在此文档
-				if res.OssDocId = docInfo.OssDocId; res.OssDocId == "" {
-					//获取附件后上传oss
-					if res.OssDocId = FileUpload(&filesystem.SaveFileReq{
-						Domain: IC.C.OssInfo.BucketName,
-						FileId: fmt.Sprintf("%s.%s", util.GetHashKey(b), docInfo.DocFileSuffix),
-						Meta: map[string]string{
-							"docName":   docInfo.DocName,
-							"docSuffix": docInfo.DocFileSuffix,
-							"docSize":   fmt.Sprintf("%d", docInfo.DocFileSize),
-						},
-						RawFileContent: b,
-					}).OssDocId; res.OssDocId != "" {
-						//更新doc
-						if errUpdate := partner.DocsUpdate(model.Doc{OssDocId: res.OssDocId}); errUpdate != nil {
-							warn.SendMsgByWXURL(fmt.Sprintf("文档id：%s,文档名称：%s 上传tidb doc 异常：%s", docInfo.Id, docInfo.DocName, err.Error()))
-						}
-						return
-					} else {
-						err = fmt.Errorf("文档上传失败")
-						warn.SendMsgByWXURL(fmt.Sprintf("文档id：%s,文档名称：%s，上传到oss异常：%s", docInfo.Id, docInfo.DocName, res.Msg))
+				if res.OssDocId = docInfo.OssDocId; res.OssDocId != "" {
+					return
+				}
+				//获取附件后上传oss
+				if res.OssDocId = FileUpload(&filesystem.SaveFileReq{
+					Domain: IC.C.OssInfo.BucketName,
+					FileId: fmt.Sprintf("%s.%s", util.GetHashKey(b), docInfo.DocFileSuffix),
+					Meta: map[string]string{
+						"docName":   docInfo.DocName,
+						"docSuffix": docInfo.DocFileSuffix,
+						"docSize":   fmt.Sprintf("%d", docInfo.DocFileSize),
+					},
+					RawFileContent: b,
+				}).OssDocId; res.OssDocId != "" {
+					//更新doc
+					if errUpdate := partner.DocsUpdate(model.Doc{OssDocId: res.OssDocId}); errUpdate != nil {
+						warn.SendMsgByWXURL(fmt.Sprintf("文档id：%s,文档名称：%s 上传tidb doc 异常：%s", docInfo.Id, docInfo.DocName, err.Error()))
 					}
+					return
+				} else {
+					err = fmt.Errorf("文档上传失败")
+					warn.SendMsgByWXURL(fmt.Sprintf("文档id：%s,文档名称：%s，上传到oss异常：%s", docInfo.Id, docInfo.DocName, err.Error()))
 				}
-				return
+			} else {
+				err = fmt.Errorf("获取文档信息异常")
 			}
 		}
 	}