From 324d6e0d50d83682e87784d1b68bda6b8cc926f7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=A1=9C=E8=8F=AF?= Date: Wed, 7 Jun 2023 14:25:04 +0800 Subject: [PATCH] =?UTF-8?q?=E6=89=8B=E5=8B=95=E4=B8=8A=E5=82=B3=E5=9C=96?= =?UTF-8?q?=E7=89=87=E6=96=87=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- go.mod | 2 +- go.sum | 31 ++++++++++++++++++++++ main.go | 4 ++- models/Image.go | 6 ++++- routers/images.go | 66 ++++++++++++++++++++++++++++++++++++++++++----- test.sh | 7 +++++ 6 files changed, 107 insertions(+), 9 deletions(-) diff --git a/go.mod b/go.mod index 276540a..a6ecfb8 100644 --- a/go.mod +++ b/go.mod @@ -13,7 +13,7 @@ require ( require ( github.com/mattn/go-sqlite3 v1.14.16 // indirect github.com/sizeofint/webp-animation v0.0.0-20190207194838-b631dc900de9 // indirect - golang.org/x/image v0.0.0-20211028202545-6944b10bf410 // indirect + golang.org/x/image v0.7.0 // indirect ) require ( diff --git a/go.sum b/go.sum index 24d7247..5e5bc1e 100644 --- a/go.sum +++ b/go.sum @@ -25,12 +25,43 @@ github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.669 h1:5KKJ github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.669/go.mod h1:7sCQWVkxcsR38nffDW057DRGk8mUjK1Ing/EFOK8s8Y= github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cvm v1.0.669 h1:gc1bPO/YVfuXEIs+HbQ/gFlFjdkJjOsjm8xWqF7hPww= github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cvm v1.0.669/go.mod h1:hhy13j6NKKxt/g62JZEDekJNQx3EAevnHopmwlt2tRc= +github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY= +golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= +golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= golang.org/x/image v0.0.0-20191009234506-e7c1f5e7dbb8/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0= golang.org/x/image v0.0.0-20211028202545-6944b10bf410 h1:hTftEOvwiOq2+O8k2D5/Q7COC7k5Qcrgc2TFURJYnvQ= golang.org/x/image v0.0.0-20211028202545-6944b10bf410/go.mod h1:023OzeP/+EPmXeapQh35lcL3II3LrY8Ic+EFFKVhULM= +golang.org/x/image v0.7.0 h1:gzS29xtG1J5ybQlv0PuyfE3nmc6R4qB73m6LUUmvFuw= +golang.org/x/image v0.7.0/go.mod h1:nd/q4ef1AKKYl/4kft7g+6UyGbdiqWqTP1ZAbRoV7Rg= +golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4= +golang.org/x/mod v0.8.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs= +golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= +golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= +golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c= +golang.org/x/net v0.6.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs= +golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.1.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= +golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= +golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= +golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= +golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ= +golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= +golang.org/x/text v0.9.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8= golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= +golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= +golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc= +golang.org/x/tools v0.6.0/go.mod h1:Xwgl3UAJ/d3gWutnCtw505GrjyAbvKui8lOU390QaIU= +golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY= diff --git a/main.go b/main.go index 6c4da6b..ba988d5 100644 --- a/main.go +++ b/main.go @@ -90,5 +90,7 @@ func main() { r.HandleFunc("/api/account", routers.AccountGet).Methods("GET") log.Println("Web Server is running on http://localhost:8080") - http.ListenAndServe(":8080", r) + if err := http.ListenAndServe(":8080", r); err != nil { + log.Fatal(err) + } } diff --git a/models/Image.go b/models/Image.go index 22bd85e..cfb4332 100644 --- a/models/Image.go +++ b/models/Image.go @@ -18,9 +18,14 @@ import ( type Image struct { ID int `json:"id" gorm:"primary_key"` Name string `json:"name"` + Hash string `json:"hash"` + Path string `json:"path"` + Type string `json:"type"` + Size int `json:"size"` Width int `json:"width"` Height int `json:"height"` Prompt string `json:"prompt"` + Format string `json:"format"` NegativePrompt string `json:"negative_prompt"` NumInferenceSteps int `json:"num_inference_steps"` // Number of inference steps (minimum: 1; maximum: 500) GuidanceScale float32 `json:"guidance_scale"` // Scale for classifier-free guidance (minimum: 1; maximum: 20) @@ -44,7 +49,6 @@ func (img *Image) ToWebP(width int, height int, fit string) ([]byte, error) { if err != nil { return nil, err } - // 如果原图是GIF格式的动态图片,直接不作尺寸处理,直接转换为webp格式 if format == "gif" { converter := giftowebp.NewConverter() diff --git a/routers/images.go b/routers/images.go index 594dcc2..5177d20 100644 --- a/routers/images.go +++ b/routers/images.go @@ -1,13 +1,21 @@ package routers import ( + "crypto/md5" "encoding/json" + "fmt" + "image" + _ "image/gif" + _ "image/jpeg" + _ "image/png" + "io/ioutil" "log" "main/configs" "main/models" "main/utils" "net/http" + "os" "github.com/gorilla/mux" ) @@ -31,23 +39,69 @@ func ImagesGet(w http.ResponseWriter, r *http.Request) { } func ImagesPost(w http.ResponseWriter, r *http.Request) { - var image models.Image - body, err := ioutil.ReadAll(r.Body) + // 接收上傳的圖片文件, 僅限一張 + file, file_header, err := r.FormFile("file") if err != nil { log.Println(err) return } - defer r.Body.Close() - if err = json.Unmarshal(body, &image); err != nil { + defer file.Close() + + // 圖片寬高 + imgData, format, err := image.Decode(file) + if err != nil { log.Println(err) return } - if err := configs.ORMDB().Create(&image).Error; err != nil { + + fmt.Println(format, imgData.Bounds().Dx(), imgData.Bounds().Dy()) + + // 將文件指針移回開頭 + if _, err := file.Seek(0, 0); err != nil { log.Println(err) return } + + // 读取文件内容 + content, err := ioutil.ReadAll(file) + if err != nil { + log.Println(err) + return + } + + // 整理文件信息 + var img models.Image + img.Name = file_header.Filename + img.Size = int(file_header.Size) // 數據大小 + img.Hash = fmt.Sprintf("%x", md5.Sum(content)) // 计算哈希 + img.Type = file_header.Header.Get("Content-Type") // 文件類型 + img.Path = fmt.Sprintf("data/images/%s.%s", img.Hash, format) // 存儲路徑 + img.Width = imgData.Bounds().Dx() + img.Height = imgData.Bounds().Dy() + img.Format = format + + // 先檢查 data/images 目錄是否存在 + if _, err := ioutil.ReadDir("data/images"); err != nil { + if err := os.Mkdir("data/images", 0777); err != nil { + log.Println(err) + return + } + } + + // 將文件存儲到本地 data/images 目錄下 + if err := ioutil.WriteFile(img.Path, content, 0666); err != nil { + log.Println(err) + return + } + + // 存儲圖片信息到數據庫 + if err := configs.ORMDB().Create(&img).Error; err != nil { + log.Println(err) + return + } + w.Header().Set("Content-Type", "application/json; charset=utf-8") - w.Write(utils.ToJSON(image)) + w.Write(utils.ToJSON(img)) } func ImagesItemGet(w http.ResponseWriter, r *http.Request) { diff --git a/test.sh b/test.sh index 26103cb..f17c917 100755 --- a/test.sh +++ b/test.sh @@ -48,6 +48,13 @@ session_id=$(echo "$response" | head -n -1 | grep -o '"id": "[^"]*' | cut -d '"' #echo "session_id: $session_id" +# 上傳圖片 (POST /api/images) +response=$(curl -X POST -H "Content-Type: multipart/form-data" -F "file=@./data/test.jpeg" -b "session_id=$session_id" -s -w "%{http_code}" http://localhost:8080/api/images) +message "$response" "上傳圖片" true + +# 臨時退出 +exit_service "測試結束, 全部通過, 用費時間: $(($(date +%s) - $start_time)) 秒" + # 創建數據集, 應當在cookie中攜帶session_id (POST /api/datasets) response=$(curl -X POST -H "Content-Type: application/json" -d '{"name":"test","description":"test"}' -b "session_id=$session_id" -s -w "%{http_code}" http://localhost:8080/api/datasets) message "$response" "創建數據集"