From 4144afcc9284110658d7d0f100d00f2d570b5a11 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BE=AE=E5=87=89?= Date: Thu, 20 Jan 2022 20:35:01 +0800 Subject: [PATCH] :bug: fix #397 139yun file size overflow int32 --- drivers/139/139.go | 2 +- drivers/139/family.go | 2 +- drivers/139/types.go | 70 +++++++++++++++++++++---------------------- 3 files changed, 37 insertions(+), 37 deletions(-) diff --git a/drivers/139/139.go b/drivers/139/139.go index 71ad64c2..081612cf 100644 --- a/drivers/139/139.go +++ b/drivers/139/139.go @@ -136,7 +136,7 @@ func (driver Cloud139) GetFiles(catalogID string, account *model.Account) ([]mod f := model.File{ Id: content.ContentID, Name: content.ContentName, - Size: int64(content.ContentSize), + Size: content.ContentSize, Type: utils.GetFileType(path.Ext(content.ContentName)), Driver: driver.Config().Name, UpdatedAt: getTime(content.UpdateTime), diff --git a/drivers/139/family.go b/drivers/139/family.go index eb60b690..05f80853 100644 --- a/drivers/139/family.go +++ b/drivers/139/family.go @@ -43,7 +43,7 @@ func (driver Cloud139) familyGetFiles(catalogID string, account *model.Account) f := model.File{ Id: content.ContentID, Name: content.ContentName, - Size: int64(content.ContentSize), + Size: content.ContentSize, Type: utils.GetFileType(path.Ext(content.ContentName)), Driver: driver.Config().Name, UpdatedAt: getTime(content.LastUpdateTime), diff --git a/drivers/139/types.go b/drivers/139/types.go index 20b2c827..4973af26 100644 --- a/drivers/139/types.go +++ b/drivers/139/types.go @@ -40,7 +40,7 @@ type Content struct { ContentID string `json:"contentID"` ContentName string `json:"contentName"` //ContentSuffix string `json:"contentSuffix"` - ContentSize int `json:"contentSize"` + ContentSize int64 `json:"contentSize"` //ContentDesc string `json:"contentDesc"` //ContentType int `json:"contentType"` //ContentOrigin int `json:"contentOrigin"` @@ -132,43 +132,43 @@ type UploadResp struct { } type CloudContent struct { - ContentID string `json:"contentID"` - Modifier string `json:"modifier"` - Nickname string `json:"nickname"` - CloudNickName string `json:"cloudNickName"` - ContentName string `json:"contentName"` - ContentType int `json:"contentType"` - ContentSuffix string `json:"contentSuffix"` - ContentSize int `json:"contentSize"` - ContentDesc string `json:"contentDesc"` - CreateTime string `json:"createTime"` - Shottime interface{} `json:"shottime"` - LastUpdateTime string `json:"lastUpdateTime"` - ThumbnailURL string `json:"thumbnailURL"` - MidthumbnailURL string `json:"midthumbnailURL"` - BigthumbnailURL string `json:"bigthumbnailURL"` - PresentURL string `json:"presentURL"` - PresentLURL string `json:"presentLURL"` - PresentHURL string `json:"presentHURL"` - ParentCatalogID string `json:"parentCatalogID"` - Uploader string `json:"uploader"` - UploaderNickName string `json:"uploaderNickName"` - TreeInfo interface{} `json:"treeInfo"` - UpdateTime interface{} `json:"updateTime"` - ExtInfo struct { - Uploader string `json:"uploader"` - } `json:"extInfo"` - EtagOprType interface{} `json:"etagOprType"` + ContentID string `json:"contentID"` + //Modifier string `json:"modifier"` + //Nickname string `json:"nickname"` + //CloudNickName string `json:"cloudNickName"` + ContentName string `json:"contentName"` + //ContentType int `json:"contentType"` + //ContentSuffix string `json:"contentSuffix"` + ContentSize int64 `json:"contentSize"` + //ContentDesc string `json:"contentDesc"` + //CreateTime string `json:"createTime"` + //Shottime interface{} `json:"shottime"` + LastUpdateTime string `json:"lastUpdateTime"` + ThumbnailURL string `json:"thumbnailURL"` + //MidthumbnailURL string `json:"midthumbnailURL"` + //BigthumbnailURL string `json:"bigthumbnailURL"` + //PresentURL string `json:"presentURL"` + //PresentLURL string `json:"presentLURL"` + //PresentHURL string `json:"presentHURL"` + //ParentCatalogID string `json:"parentCatalogID"` + //Uploader string `json:"uploader"` + //UploaderNickName string `json:"uploaderNickName"` + //TreeInfo interface{} `json:"treeInfo"` + //UpdateTime interface{} `json:"updateTime"` + //ExtInfo struct { + // Uploader string `json:"uploader"` + //} `json:"extInfo"` + //EtagOprType interface{} `json:"etagOprType"` } type CloudCatalog struct { - CatalogID string `json:"catalogID"` - CatalogName string `json:"catalogName"` - CloudID string `json:"cloudID"` - CreateTime string `json:"createTime"` - LastUpdateTime string `json:"lastUpdateTime"` - Creator string `json:"creator"` - CreatorNickname string `json:"creatorNickname"` + CatalogID string `json:"catalogID"` + CatalogName string `json:"catalogName"` + //CloudID string `json:"cloudID"` + //CreateTime string `json:"createTime"` + LastUpdateTime string `json:"lastUpdateTime"` + //Creator string `json:"creator"` + //CreatorNickname string `json:"creatorNickname"` } type QueryContentListResp struct {