diff --git a/main.go b/main.go index f9c4235..a6810d9 100644 --- a/main.go +++ b/main.go @@ -12,6 +12,84 @@ import ( "github.com/gorilla/mux" ) +//// 獲取查詢參數(int64 類型) +//func ParamInt(value string, defaultValue int64) int64 { +// if value == "" { +// return defaultValue +// } +// if v, err := strconv.ParseInt(value, 10, 64); err == nil { +// return v +// } +// return defaultValue +//} +// +//func getlist(w http.ResponseWriter, r *http.Request) { +// listview := struct { +// Name string `json:"name"` +// Page int64 `json:"page"` +// PageSize int64 `json:"pageSize"` +// Total int64 `json:"total"` +// Next bool `json:"next"` +// List interface{} `json:"list"` +// }{ +// Name: mux.Vars(r)["name"], +// Page: ParamInt(r.URL.Query().Get("page"), 1), +// PageSize: ParamInt(r.URL.Query().Get("pageSize"), 10), +// Total: 0, +// Next: false, +// List: make([]interface{}, 0), +// } +// +// // 选择对应的模型 +// switch listview.Name { +// case "sessions": +// listview.List = []models.Session{} +// case "users": +// listview.List = []models.User{} +// case "models": +// listview.List = []models.Model{} +// case "images": +// listview.List = []models.Image{} +// case "tags": +// listview.List = []models.Tag{} +// case "servers": +// listview.List = []models.Server{} +// case "datasets": +// listview.List = []models.Dataset{} +// default: +// fmt.Fprintf(w, "404") +// return +// } +// +// // 从数据库中获取数据 +// db := configs.ORMDB() +// //if task := r.URL.Query().Get("task"); task != "" { +// // db = db.Where("task = ?", task) +// //} +// //if status := r.URL.Query().Get("status"); status != "" { +// // db = db.Where("status = ?", status) +// //} +// //if user_id := r.URL.Query().Get("user_id"); user_id != "" { +// // db = db.Where("user_id = ?", user_id) +// //} +// //if model_id := r.URL.Query().Get("model_id"); model_id != "" { +// // db = db.Where("model_id = ?", model_id) +// //} +// //// 获取指定用户喜欢的对象(图像) +// //if like := r.URL.Query().Get("like"); like != "" { +// // list, _ := models.LikeImage.GetA(like) +// // db = db.Where("id in (?)", list) +// //} +// // 分页数据 +// db = db.Offset(int((listview.Page - 1) * listview.PageSize)).Limit(int(listview.PageSize)) +// db.Find(&listview.List).Count(&listview.Total) +// +// // 轉換爲JSON並返回 +// data, _ := json.MarshalIndent(listview, "", " ") +// w.Header().Set("Content-Type", "application/json; charset=utf-8") +// w.Write(data) +//} + func main() { runtime.GOMAXPROCS(runtime.NumCPU()) log.SetFlags(log.Lshortfile | log.LstdFlags) @@ -36,6 +114,7 @@ func main() { // 設定路由 r.HandleFunc("/api", routers.GetDocs).Methods("GET") + //r.HandleFunc("/api/{name}", getlist).Methods("GET") r.HandleFunc("/api/sessions", routers.SessionsGet).Methods("GET") r.HandleFunc("/api/sessions", routers.SessionsPost).Methods("POST") @@ -95,19 +174,9 @@ func main() { r.HandleFunc("/img/{id}", routers.WebpGet).Methods("GET") // 設定靜態資源 (前端) 位于dist目录下 - //cacheTime := 7 * 24 * time.Hour r.PathPrefix("/images/").Handler(http.FileServer(http.Dir("./data/"))) - //.Headers("Cache-Control", fmt.Sprintf("max-age=%d", int(cacheTime.Seconds()))) r.PathPrefix("/").Handler(http.FileServer(http.Dir("./dist/"))) - //// 設定靜態資源 (前端) 位于dist目录下, 并且为 图片和 js/css 设置缓存时间为7天 - //cacheTime := 7 * 24 * time.Hour - //r.PathPrefix("/images/").Handler(http.StripPrefix("/images/", http.FileServer(http.Dir("./data/images/")))).Headers("Cache-Control", fmt.Sprintf("max-age=%d", int(cacheTime.Seconds()))).Methods("GET") - //r.PathPrefix("/static/").Handler(http.StripPrefix("/static/", http.FileServer(http.Dir("./dist/static/")))).Headers("Cache-Control", fmt.Sprintf("max-age=%d", int(cacheTime.Seconds()))).Methods("GET") - //r.PathPrefix("/favicon.ico").Handler(http.StripPrefix("/", http.FileServer(http.Dir("./dist/favicon.ico")))).Headers("Cache-Control", fmt.Sprintf("max-age=%d", int(cacheTime.Seconds()))).Methods("GET") - //r.PathPrefix("/").Handler(http.StripPrefix("/", http.FileServer(http.Dir("./dist/")))).Methods("GET") - //r.PathPrefix("/").Handler(http.StripPrefix("/", http.FileServer(http.Dir("./dist/")))).Headers("Cache-Control", fmt.Sprintf("max-age=%d", int(cacheTime.Seconds()))).Methods("GET") - log.Println("Web Server is running on http://localhost:8080") if err := http.ListenAndServe(":8080", r); err != nil { log.Fatal(err) diff --git a/models/ListView.go b/models/ListView.go index 7fb28e8..9f034b7 100644 --- a/models/ListView.go +++ b/models/ListView.go @@ -7,12 +7,12 @@ import ( ) type ListView struct { - Page int `json:"page"` - PageSize int `json:"page_size"` - Total int64 `json:"total"` - Next bool `json:"next"` - List []interface{} `json:"list"` - Type string `json:"-"` + Page int `json:"page"` + PageSize int `json:"page_size"` + Total int64 `json:"total"` + Next bool `json:"next"` + List interface{} `json:"list"` + Type string `json:"-"` } // 轉換爲JSON並返回 @@ -28,59 +28,6 @@ func (listview *ListView) ToJSON() []byte { return b } -//func (listview *ListView) Readx(r *http.Request, model interface{}, list interface{}) error { -// listview.Page = utils.ParamInt(r.URL.Query().Get("page"), 1) -// listview.PageSize = utils.ParamInt(r.URL.Query().Get("pageSize"), 10) -// db := configs.ORMDB() -// db.Model(&model).Offset((listview.Page - 1) * listview.PageSize).Limit(listview.PageSize).Find(&list) -// db.Model(&model).Count(&listview.Total) -// listview.Next = listview.Page*listview.PageSize < int(listview.Total) -// listview.List = list.([]interface{}) -// return nil -//} -// -//func (listview *ListView) Read(r *http.Request) error { -// listview.Page = utils.ParamInt(r.URL.Query().Get("page"), 1) -// listview.PageSize = utils.ParamInt(r.URL.Query().Get("pageSize"), 10) -// -// db := configs.ORMDB() -// -// // 按照 user_id 篩選 -// if user_id := utils.ParamInt(r.URL.Query().Get("user_id"), 0); user_id > 0 { -// db = db.Where("user_id = ?", user_id) -// } -// -// // 按照 star 篩選 -// if star := utils.ParamInt(r.URL.Query().Get("star"), 0); star > 0 { -// db = db.Where("stars LIKE ?", "%"+strconv.Itoa(star)+"%") -// } -// -// // 按照 name 模糊搜索 -// if name := r.URL.Query().Get("name"); name != "" { -// db = db.Where("name LIKE ?", "%"+name+"%") -// } -// -// // 按照 type 篩選 -// if model_type := r.URL.Query().Get("type"); model_type != "" { -// db = db.Where("type = ?", model_type) -// } -// -// // 按照 status 篩選 -// if status := r.URL.Query().Get("status"); status != "" { -// db = db.Where("status = ?", status) -// } -// -// // 按照 tag 篩選 -// if tag := r.URL.Query().Get("tag"); tag != "" { -// db = db.Where("tags LIKE ?", "%"+tag+"%") -// } -// -// db.Offset((listview.Page - 1) * listview.PageSize).Limit(listview.PageSize).Find(&listview.List) -// db.Model(listview.List).Count(&listview.Total) -// -// return nil -//} - // 直接輸出JSON給瀏覽器 func (listview *ListView) WriteJSON(w http.ResponseWriter) { w.Header().Set("Content-Type", "application/json; charset=utf-8") diff --git a/routers/datasets.go b/routers/datasets.go index 6b203f8..26fc8ec 100644 --- a/routers/datasets.go +++ b/routers/datasets.go @@ -21,14 +21,13 @@ func DatasetsGet(w http.ResponseWriter, r *http.Request) { listview.PageSize = utils.ParamInt(r.URL.Query().Get("pageSize"), 10) var dataset_list []models.Dataset db := configs.ORMDB() - db.Offset((listview.Page - 1) * listview.PageSize).Limit(listview.PageSize).Find(&dataset_list) + db.Offset((listview.Page - 1) * listview.PageSize).Limit(listview.PageSize).Find(&dataset_list).Count(&listview.Total) for _, dataset := range dataset_list { if dataset.Images == nil { dataset.Images = models.ImageList{} } - listview.List = append(listview.List, dataset) } - db.Model(&models.Dataset{}).Count(&listview.Total) + listview.List = dataset_list listview.Next = listview.Page*listview.PageSize < int(listview.Total) listview.WriteJSON(w) } diff --git a/routers/images.go b/routers/images.go index 7314727..183458b 100644 --- a/routers/images.go +++ b/routers/images.go @@ -116,14 +116,16 @@ func ImagesGet(w http.ResponseWriter, r *http.Request) { db = db.Where("id IN (?)", list) } - db.Offset((listview.Page - 1) * listview.PageSize).Limit(listview.PageSize).Find(&image_list) + db.Offset((listview.Page - 1) * listview.PageSize).Limit(listview.PageSize).Find(&image_list).Count(&listview.Total) for _, image := range image_list { image.User = models.User{ID: image.UserID} - listview.List = append(listview.List, image) + db.First(&image.User) + if image.Preview == "" { + image.Preview = "https://image.gameuiux.cn/2023/06/27/1687851028u=3116699095,2862677591&fm=253&fmt=auto&app=120&f=JPEG.webp" + } } - db.Model(&models.Image{}).Count(&listview.Total) - + listview.List = image_list listview.Next = listview.Page*listview.PageSize < int(listview.Total) listview.WriteJSON(w) } diff --git a/routers/models.go b/routers/models.go index 7a8285e..f2c137e 100644 --- a/routers/models.go +++ b/routers/models.go @@ -142,12 +142,12 @@ func ModelsGet(w http.ResponseWriter, r *http.Request) { db = db.Where("id IN (?)", list) } - db.Offset((listview.Page - 1) * listview.PageSize).Limit(listview.PageSize).Find(&model_list) + db.Offset((listview.Page - 1) * listview.PageSize).Limit(listview.PageSize).Find(&model_list).Count(&listview.Total) for _, model := range model_list { model.User = models.User{ID: model.UserID} - listview.List = append(listview.List, model) + db.Take(&model.User) } - db.Model(&models.Model{}).Count(&listview.Total) + listview.List = model_list listview.Next = listview.Page*listview.PageSize < int(listview.Total) listview.WriteJSON(w) } diff --git a/routers/params.go b/routers/params.go index 2e5f290..e8737db 100644 --- a/routers/params.go +++ b/routers/params.go @@ -13,7 +13,8 @@ func ParamsListGet(w http.ResponseWriter, r *http.Request) { item["id"] = "model" item["name"] = "模型" - listview.List = append(listview.List, item) + //listview.List = append(listview.List, item) + listview.List = []interface{}{item} listview.Total = 1 listview.Page = 1 listview.PageSize = 10 diff --git a/routers/servers.go b/routers/servers.go index 3099938..ec9d693 100644 --- a/routers/servers.go +++ b/routers/servers.go @@ -38,8 +38,9 @@ func ServersGet(w http.ResponseWriter, r *http.Request) { // } // server.Models = models //} - listview.List = append(listview.List, server) + //listview.List = append(listview.List, server) } + listview.List = server_list listview.Next = listview.Page*listview.PageSize < int(listview.Total) listview.WriteJSON(w) } diff --git a/routers/sessions.go b/routers/sessions.go index 3ebaaa8..1b3ca7f 100644 --- a/routers/sessions.go +++ b/routers/sessions.go @@ -20,11 +20,8 @@ func SessionsGet(w http.ResponseWriter, r *http.Request) { listview.PageSize = utils.ParamInt(r.URL.Query().Get("pageSize"), 10) var session_list []models.Session db := configs.ORMDB() - db.Offset((listview.Page - 1) * listview.PageSize).Limit(listview.PageSize).Find(&session_list) - for _, session := range session_list { - listview.List = append(listview.List, session) - } - db.Model(&models.Session{}).Count(&listview.Total) + db.Offset((listview.Page - 1) * listview.PageSize).Limit(listview.PageSize).Find(&session_list).Count(&listview.Total) + listview.List = session_list listview.Next = listview.Page*listview.PageSize < int(listview.Total) listview.WriteJSON(w) } diff --git a/routers/tags.go b/routers/tags.go index b3de16a..7fa9688 100644 --- a/routers/tags.go +++ b/routers/tags.go @@ -19,11 +19,8 @@ func TagsGet(w http.ResponseWriter, r *http.Request) { listview.PageSize = utils.ParamInt(r.URL.Query().Get("pageSize"), 10) var tag_list []models.Tag db := configs.ORMDB() - db.Offset((listview.Page - 1) * listview.PageSize).Limit(listview.PageSize).Find(&tag_list) - for _, tag := range tag_list { - listview.List = append(listview.List, tag) - } - db.Model(&models.Tag{}).Count(&listview.Total) + db.Offset((listview.Page - 1) * listview.PageSize).Limit(listview.PageSize).Find(&tag_list).Count(&listview.Total) + listview.List = tag_list listview.Next = listview.Page*listview.PageSize < int(listview.Total) listview.WriteJSON(w) } diff --git a/routers/users.go b/routers/users.go index cb2c8bb..0d78ea2 100644 --- a/routers/users.go +++ b/routers/users.go @@ -20,11 +20,8 @@ func UsersGet(w http.ResponseWriter, r *http.Request) { listview.PageSize = utils.ParamInt(r.URL.Query().Get("pageSize"), 10) var user_list []models.User db := configs.ORMDB() - db.Offset((listview.Page - 1) * listview.PageSize).Limit(listview.PageSize).Find(&user_list) - for _, user := range user_list { - listview.List = append(listview.List, user) - } - db.Model(&models.User{}).Count(&listview.Total) + db.Offset((listview.Page - 1) * listview.PageSize).Limit(listview.PageSize).Find(&user_list).Count(&listview.Total) + listview.List = user_list listview.Next = listview.Page*listview.PageSize < int(listview.Total) listview.WriteJSON(w) }