feat: add url for the uploaded api

saltbo · Feb 7, 2021 · f17c150 · f17c150
1 parent ba730d5
commit f17c150
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 13 deletions.
diff --git a/internal/app/service/file.go b/internal/app/service/file.go
@@ -66,21 +66,21 @@ func (f *File) PreSignPutURL(matter *model.Matter) (url string, headers http.Hea
 }
 
 func (f *File) UploadDone(uid int64, alias string) (*model.Matter, error) {
+	m, err := f.FindUserMatter(uid, alias)
+	if err != nil {
+		return nil, err
+	}
+
 	if err := f.Matter.Uploaded(alias); err != nil {
 		return nil, err
 	}
 
-	m, err := f.FindUserMatter(uid, alias)
+	link, err := f.BuildGetURL(alias)
 	if err != nil {
 		return nil, err
 	}
 
-	//provider, err := f.sStorage.GetProvider(m.Sid)
-	//if err != nil {
-	//	return nil, err
-	//}
-
-	//m.SetURL(provider.PublicURL)
+	m.URL = link
 	return m, nil
 }
 

diff --git a/internal/pkg/bind/file.go b/internal/pkg/bind/file.go
@@ -13,12 +13,12 @@ type QueryFiles struct {
 }
 
 type BodyFile struct {
-	Sid    int64  `json:"sid" binding:"required"`
-	Name   string `json:"name" binding:"required"`
-	Size   int64  `json:"size" binding:"required"`
-	Type   string `json:"type"`
-	Dir    string `json:"dir"`
-	Public bool   `json:"public"`
+	Sid  int64  `json:"sid" binding:"required"`
+	Name string `json:"name" binding:"required"`
+	Size int64  `json:"size" binding:"required"`
+	Type string `json:"type"`
+	Dir  string `json:"dir"`
+	//Public bool   `json:"public"`
 }
 
 func (p *BodyFile) ToMatter(uid int64) *model.Matter {