sundynix/sundynix-pets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat: 养护模板/社区运营/体重趋势/计划日历 + 雪花ID重构 + 文件表与图片上传

Browse Source 
后端
- 主键改雪花字符串 ID（pkg/idgen + Base.BeforeCreate），全表外键/JWT/中间件随之调整
- 新增 files 表：/api/upload 按 MD5 去重，返回 {id,url,md5}，服务端只收图片
- 头像/记录附图/帖子图改 file_id 关联，读取解析为 URL
- 养护模板（物种×阶段）后台可配 + AI 生成草稿；建档按模板生成任务/计划/提醒
- 社区 AI 运营：虚拟账号池 + 每日定时/手动生成，帖子带 AI 标
- 计划路线图节点带真实日期；首页周历与计划日历同源；新增 day-plan 当日安排
- 体重趋势接口带备注；记录列表分页

小程序
- 公共图片上传 utils/upload.js（仅图片）；记录拍照/我的头像/社区发图三处接入
- 首页日历点选查当日任务；记录页体重趋势可点看备注 + 时间轴分页折叠
- 计划页日历点选查当日计划；自定义 tabBar 高度调整

后台（React）
- 新增「养护模板」「社区运营」页；用户管理加机器人筛选

Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
This commit is contained in:
Blizzard
2026-07-06 08:48:15 +08:00
parent 609f7d06cf
commit 2f5dd6eefc
83 changed files with 2253 additions and 355 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pets-be/internal/handler/admin.go
+121 -6
View File
@@ -5,6 +5,7 @@ import (
"github.com/sundynix/pets-be/internal/middleware"
"github.com/sundynix/pets-be/internal/model"
"github.com/sundynix/pets-be/internal/service"
appjwt "github.com/sundynix/pets-be/pkg/jwt"
"github.com/sundynix/pets-be/pkg/response"
)
@@ -58,6 +59,7 @@ type adminListReq struct {
response.PageQuery
Keyword string `form:"keyword"`
Status string `form:"status"`
Type string `form:"type"`
}
// AdminListUsers GET /api/admin/users
@@ -65,7 +67,7 @@ func (h *Handler) AdminListUsers(c *gin.Context) {
var req adminListReq
_ = c.ShouldBindQuery(&req)
req.Normalize()
users, total, err := h.svc.ListUsers(req.Keyword, req.Offset(), req.Limit())
users, total, err := h.svc.ListUsers(req.Keyword, req.Type, req.Offset(), req.Limit())
if err != nil {
response.FailErr(c, err)
return
@@ -84,7 +86,7 @@ func (h *Handler) AdminSetUserDisabled(c *gin.Context) {
response.FailParams(c, err.Error())
return
}
if err := h.svc.SetUserDisabled(uintParam(c, "id"), req.Disabled); err != nil {
if err := h.svc.SetUserDisabled(idParam(c, "id"), req.Disabled); err != nil {
response.FailErr(c, err)
return
}
@@ -128,7 +130,7 @@ func (h *Handler) AdminSetPostStatus(c *gin.Context) {
response.FailParams(c, err.Error())
return
}
if err := h.svc.SetPostStatus(uintParam(c, "id"), req.Status); err != nil {
if err := h.svc.SetPostStatus(idParam(c, "id"), req.Status); err != nil {
respondErr(c, err)
return
}
@@ -150,7 +152,7 @@ func (h *Handler) AdminListComments(c *gin.Context) {
// AdminDeleteComment DELETE /api/admin/comments/:id
func (h *Handler) AdminDeleteComment(c *gin.Context) {
if err := h.svc.DeleteCommentAdmin(uintParam(c, "id")); err != nil {
if err := h.svc.DeleteCommentAdmin(idParam(c, "id")); err != nil {
response.FailErr(c, err)
return
}
@@ -171,7 +173,7 @@ func (h *Handler) AdminListArticles(c *gin.Context) {
}
type articleReq struct {
ID uint `json:"id"`
ID string `json:"id"`
Icon string `json:"icon"`
Title string `json:"title"`
Description string `json:"description"`
@@ -202,7 +204,7 @@ func (h *Handler) AdminSaveArticle(c *gin.Context) {
// AdminDeleteArticle DELETE /api/admin/articles/:id
func (h *Handler) AdminDeleteArticle(c *gin.Context) {
if err := h.svc.DeleteArticle(uintParam(c, "id")); err != nil {
if err := h.svc.DeleteArticle(idParam(c, "id")); err != nil {
respondErr(c, err)
return
}
@@ -221,3 +223,116 @@ func (h *Handler) AdminListPro(c *gin.Context) {
}
response.OK(c, response.NewPage(list, total, req.PageQuery))
}
// AdminCareTemplateMeta GET /api/admin/care-templates/meta
// 给后台下拉用：物种、阶段、可选关联记录/弹层类型、提醒类型
func (h *Handler) AdminCareTemplateMeta(c *gin.Context) {
response.OK(c, gin.H{
"species": []gin.H{
{"key": model.SpeciesCat, "label": "猫猫"},
{"key": model.SpeciesDog, "label": "狗狗"},
},
"stages": service.CareStages,
"task_sheets": []string{"", "weight", "poop", "food", "symptom", "vaccine", "medicine"},
"plan_sheets": []string{"", "weight", "vaccine", "medicine", "report", "taskDetail"},
"reminder_types": []string{"vaccine", "deworm", "weight", "monthlyReport"},
"priorities": []string{"", "重要"},
})
}
// AdminGetCareTemplate GET /api/admin/care-templates?species=&stage=
func (h *Handler) AdminGetCareTemplate(c *gin.Context) {
data, err := h.svc.GetCareTemplate(c.Query("species"), c.Query("stage"))
if err != nil {
response.FailParams(c, err.Error())
return
}
response.OK(c, data)
}
type careTemplateReq struct {
Species string `json:"species"`
Stage string `json:"stage"`
Items []model.CareTemplateItem `json:"items"`
}
// AdminSaveCareTemplate PUT /api/admin/care-templates
func (h *Handler) AdminSaveCareTemplate(c *gin.Context) {
var req careTemplateReq
if err := c.ShouldBindJSON(&req); err != nil {
response.FailParams(c, err.Error())
return
}
if err := h.svc.SaveCareTemplate(req.Species, req.Stage, req.Items); err != nil {
response.FailErr(c, err)
return
}
data, _ := h.svc.GetCareTemplate(req.Species, req.Stage)
response.OK(c, data)
}
type careGenReq struct {
Species string `json:"species"`
Stage string `json:"stage"`
}
// AdminGenerateCareTemplate POST /api/admin/care-templates/generate
// AI 生成草稿（不落库），未开启 AI 时回退内置默认
func (h *Handler) AdminGenerateCareTemplate(c *gin.Context) {
var req careGenReq
if err := c.ShouldBindJSON(&req); err != nil {
response.FailParams(c, err.Error())
return
}
items, err := h.svc.GenerateCareTemplate(req.Species, req.Stage)
if err != nil {
response.FailParams(c, err.Error())
return
}
response.OK(c, gin.H{"species": req.Species, "stage": req.Stage, "items": items})
}
// AdminGetCommunityBot GET /api/admin/community-bot
func (h *Handler) AdminGetCommunityBot(c *gin.Context) {
response.OK(c, h.svc.GetCommunityBotConfig())
}
// AdminSaveCommunityBot PUT /api/admin/community-bot
func (h *Handler) AdminSaveCommunityBot(c *gin.Context) {
var req model.CommunityBotConfig
if err := c.ShouldBindJSON(&req); err != nil {
response.FailParams(c, err.Error())
return
}
saved, err := h.svc.SaveCommunityBotConfig(req)
if err != nil {
response.FailErr(c, err)
return
}
response.OK(c, saved)
}
type communityGenReq struct {
Count int `json:"count"`
}
// AdminGenerateCommunityPosts POST /api/admin/community-bot/generate
func (h *Handler) AdminGenerateCommunityPosts(c *gin.Context) {
var req communityGenReq
if err := c.ShouldBindJSON(&req); err != nil {
response.FailParams(c, err.Error())
return
}
if req.Count <= 0 {
req.Count = 1
}
if req.Count > 30 {
req.Count = 30
}
made, err := h.svc.GenerateCommunityPosts(req.Count)
if err != nil {
response.FailErr(c, err)
return
}
response.OK(c, gin.H{"made": made})
}
pets-be/internal/handler/auth.go
+7 -3
View File
@@ -89,9 +89,10 @@ func (h *Handler) Profile(c *gin.Context) {
}
type updateProfileReq struct {
Nickname *string `json:"nickname"`
Avatar *string `json:"avatar"`
Phone *string `json:"phone"`
Nickname *string `json:"nickname"`
Avatar *string `json:"avatar"`
AvatarFileID *string `json:"avatar_file_id"`
Phone *string `json:"phone"`
}
// UpdateProfile 更新资料
@@ -108,6 +109,9 @@ func (h *Handler) UpdateProfile(c *gin.Context) {
if req.Avatar != nil {
fields["avatar"] = *req.Avatar
}
if req.AvatarFileID != nil {
fields["avatar_file_id"] = *req.AvatarFileID
}
if req.Phone != nil {
fields["phone"] = *req.Phone
}
pets-be/internal/handler/community.go
+16 -10
View File
@@ -30,7 +30,7 @@ func (h *Handler) ListPosts(c *gin.Context) {
// GetPost GET /api/posts/:id
func (h *Handler) GetPost(c *gin.Context) {
post, err := h.svc.GetPost(uintParam(c, "id"))
post, err := h.svc.GetPost(idParam(c, "id"))
if err != nil {
respondErr(c, err)
return
@@ -39,11 +39,12 @@ func (h *Handler) GetPost(c *gin.Context) {
}
type postReq struct {
PetID *uint `json:"pet_id"`
Identity string `json:"identity"`
Content string `json:"content"`
Tags []string `json:"tags"`
Images []string `json:"images"`
PetID *string `json:"pet_id"`
Identity string `json:"identity"`
Content string `json:"content"`
Tags []string `json:"tags"`
Images []string `json:"images"`
ImageFileIDs []string `json:"image_file_ids"`
}
// CreatePost POST /api/posts
@@ -60,6 +61,11 @@ func (h *Handler) CreatePost(c *gin.Context) {
if b, err := jsonMarshal(req.Images); err == nil {
in.Images = datatypes.JSON(b)
}
if len(req.ImageFileIDs) > 0 {
if b, err := jsonMarshal(req.ImageFileIDs); err == nil {
in.ImageFileIDs = datatypes.JSON(b)
}
}
post, err := h.svc.CreatePost(middleware.UserID(c), in)
if err != nil {
response.FailErr(c, err)
@@ -70,7 +76,7 @@ func (h *Handler) CreatePost(c *gin.Context) {
// LikePost POST /api/posts/:id/like
func (h *Handler) LikePost(c *gin.Context) {
count, err := h.svc.LikePost(middleware.UserID(c), uintParam(c, "id"))
count, err := h.svc.LikePost(middleware.UserID(c), idParam(c, "id"))
if err != nil {
respondErr(c, err)
return
@@ -80,7 +86,7 @@ func (h *Handler) LikePost(c *gin.Context) {
// UnlikePost DELETE /api/posts/:id/like
func (h *Handler) UnlikePost(c *gin.Context) {
count, err := h.svc.UnlikePost(middleware.UserID(c), uintParam(c, "id"))
count, err := h.svc.UnlikePost(middleware.UserID(c), idParam(c, "id"))
if err != nil {
respondErr(c, err)
return
@@ -98,7 +104,7 @@ func (h *Handler) ListComments(c *gin.Context) {
_ = c.ShouldBindQuery(&req)
req.Normalize()
comments, total, err := h.svc.ListComments(uintParam(c, "id"), req.Offset(), req.Limit())
comments, total, err := h.svc.ListComments(idParam(c, "id"), req.Offset(), req.Limit())
if err != nil {
response.FailErr(c, err)
return
@@ -121,7 +127,7 @@ func (h *Handler) CreateComment(c *gin.Context) {
response.FailParams(c, "评论内容不能为空")
return
}
comment, err := h.svc.CreateComment(middleware.UserID(c), uintParam(c, "id"), req.Content)
comment, err := h.svc.CreateComment(middleware.UserID(c), idParam(c, "id"), req.Content)
if err != nil {
respondErr(c, err)
return
pets-be/internal/handler/helper.go
+3 -5
View File
@@ -3,7 +3,6 @@ package handler
import (
"encoding/json"
"errors"
"strconv"
"github.com/gin-gonic/gin"
@@ -12,10 +11,9 @@ import (
"github.com/sundynix/pets-be/pkg/response"
)
// uintParam 解析路径参数为 uint
func uintParam(c *gin.Context, key string) uint {
v, _ := strconv.ParseUint(c.Param(key), 10, 64)
return uint(v)
// idParam 取路径参数（字符串雪花 ID）
func idParam(c *gin.Context, key string) string {
return c.Param(key)
}
// jsonMarshal 便捷序列化
pets-be/internal/handler/misc.go
+4 -4
View File
@@ -20,7 +20,7 @@ func (h *Handler) ListArticles(c *gin.Context) {
// GetArticle GET /api/articles/:id
func (h *Handler) GetArticle(c *gin.Context) {
article, err := h.svc.GetArticle(uintParam(c, "id"))
article, err := h.svc.GetArticle(idParam(c, "id"))
if err != nil {
respondErr(c, err)
return
@@ -49,7 +49,7 @@ func (h *Handler) ActivatePro(c *gin.Context) {
}
type aiChatReq struct {
PetID *uint `json:"pet_id"`
PetID *string `json:"pet_id"`
Session string `json:"session"`
Text string `json:"text"`
}
@@ -75,7 +75,7 @@ func (h *Handler) AIChat(c *gin.Context) {
// HomeSummary GET /api/pets/:id/home-summary
func (h *Handler) HomeSummary(c *gin.Context) {
res, err := h.svc.GetHomeSummary(middleware.UserID(c), uintParam(c, "id"))
res, err := h.svc.GetHomeSummary(middleware.UserID(c), idParam(c, "id"))
if err != nil {
respondErr(c, err)
return
@@ -106,7 +106,7 @@ func (h *Handler) AssessSymptom(c *gin.Context) {
response.FailParams(c, err.Error())
return
}
res, err := h.svc.AssessSymptom(middleware.UserID(c), uintParam(c, "id"), service.SymptomInput{
res, err := h.svc.AssessSymptom(middleware.UserID(c), idParam(c, "id"), service.SymptomInput{
Symptoms: req.Symptoms, Duration: req.Duration, Spirit: req.Spirit,
})
if err != nil {
pets-be/internal/handler/pet.go
+11 -6
View File
@@ -20,15 +20,17 @@ type petReq struct {
Weight string `json:"weight"`
Stage string `json:"stage"`
Age string `json:"age"`
Color string `json:"color"`
Breed string `json:"breed"`
Goals []string `json:"goals"`
Color string `json:"color"`
Breed string `json:"breed"`
AvatarFileID string `json:"avatar_file_id"`
Goals []string `json:"goals"`
}
func (r petReq) toInput() service.PetInput {
in := service.PetInput{
Name: r.Name, Emoji: r.Emoji, Type: r.Type, Gender: r.Gender,
Weight: r.Weight, Stage: r.Stage, Age: r.Age, Color: r.Color, Breed: r.Breed,
AvatarFileID: r.AvatarFileID,
}
if r.Birthday != "" {
if t, err := time.Parse("2006-01-02", r.Birthday); err == nil {
@@ -70,7 +72,7 @@ func (h *Handler) CreatePet(c *gin.Context) {
// GetPet GET /api/pets/:id
func (h *Handler) GetPet(c *gin.Context) {
pet, err := h.svc.GetPet(middleware.UserID(c), uintParam(c, "id"))
pet, err := h.svc.GetPet(middleware.UserID(c), idParam(c, "id"))
if err != nil {
respondErr(c, err)
return
@@ -110,7 +112,10 @@ func (h *Handler) UpdatePet(c *gin.Context) {
if req.Breed != "" {
fields["breed"] = req.Breed
}
pet, err := h.svc.UpdatePet(middleware.UserID(c), uintParam(c, "id"), fields)
if req.AvatarFileID != "" {
fields["avatar_file_id"] = req.AvatarFileID
}
pet, err := h.svc.UpdatePet(middleware.UserID(c), idParam(c, "id"), fields)
if err != nil {
respondErr(c, err)
return
@@ -120,7 +125,7 @@ func (h *Handler) UpdatePet(c *gin.Context) {
// DeletePet DELETE /api/pets/:id
func (h *Handler) DeletePet(c *gin.Context) {
if err := h.svc.DeletePet(middleware.UserID(c), uintParam(c, "id")); err != nil {
if err := h.svc.DeletePet(middleware.UserID(c), idParam(c, "id")); err != nil {
respondErr(c, err)
return
}
pets-be/internal/handler/plan.go
+18 -8
View File
@@ -17,7 +17,7 @@ func (h *Handler) ListTasks(c *gin.Context) {
date = &t
}
}
tasks, err := h.svc.ListTasks(middleware.UserID(c), uintParam(c, "id"), date)
tasks, err := h.svc.ListTasks(middleware.UserID(c), idParam(c, "id"), date)
if err != nil {
respondErr(c, err)
return
@@ -27,7 +27,7 @@ func (h *Handler) ListTasks(c *gin.Context) {
// ToggleTask POST /api/tasks/:id/toggle
func (h *Handler) ToggleTask(c *gin.Context) {
task, err := h.svc.ToggleTask(middleware.UserID(c), uintParam(c, "id"))
task, err := h.svc.ToggleTask(middleware.UserID(c), idParam(c, "id"))
if err != nil {
respondErr(c, err)
return
@@ -37,7 +37,7 @@ func (h *Handler) ToggleTask(c *gin.Context) {
// CompleteAllTasks POST /api/pets/:id/tasks/complete-all
func (h *Handler) CompleteAllTasks(c *gin.Context) {
tasks, err := h.svc.CompleteAllTasks(middleware.UserID(c), uintParam(c, "id"))
tasks, err := h.svc.CompleteAllTasks(middleware.UserID(c), idParam(c, "id"))
if err != nil {
respondErr(c, err)
return
@@ -47,7 +47,7 @@ func (h *Handler) CompleteAllTasks(c *gin.Context) {
// GetPlan GET /api/pets/:id/plan
func (h *Handler) GetPlan(c *gin.Context) {
plan, err := h.svc.GetPlan(middleware.UserID(c), uintParam(c, "id"))
plan, err := h.svc.GetPlan(middleware.UserID(c), idParam(c, "id"))
if err != nil {
respondErr(c, err)
return
@@ -55,6 +55,16 @@ func (h *Handler) GetPlan(c *gin.Context) {
response.OK(c, plan)
}
// DayPlan GET /api/pets/:id/day-plan?date=YYYY-MM-DD
func (h *Handler) DayPlan(c *gin.Context) {
res, err := h.svc.DayPlan(middleware.UserID(c), idParam(c, "id"), c.Query("date"))
if err != nil {
respondErr(c, err)
return
}
response.OK(c, res)
}
// PlanCalendar GET /api/pets/:id/plan/calendar?month=YYYY-MM
func (h *Handler) PlanCalendar(c *gin.Context) {
now := time.Now()
@@ -64,7 +74,7 @@ func (h *Handler) PlanCalendar(c *gin.Context) {
year, month = t.Year(), int(t.Month())
}
}
res, err := h.svc.Calendar(middleware.UserID(c), uintParam(c, "id"), year, month)
res, err := h.svc.Calendar(middleware.UserID(c), idParam(c, "id"), year, month)
if err != nil {
respondErr(c, err)
return
@@ -83,7 +93,7 @@ func (h *Handler) CreateAIPlan(c *gin.Context) {
response.FailParams(c, err.Error())
return
}
plan, err := h.svc.CreateAIPlan(middleware.UserID(c), uintParam(c, "id"), req.Input)
plan, err := h.svc.CreateAIPlan(middleware.UserID(c), idParam(c, "id"), req.Input)
if err != nil {
respondErr(c, err)
return
@@ -93,7 +103,7 @@ func (h *Handler) CreateAIPlan(c *gin.Context) {
// ApplyAIPlan POST /api/ai-plan/:id/apply
func (h *Handler) ApplyAIPlan(c *gin.Context) {
plan, err := h.svc.ApplyAIPlan(middleware.UserID(c), uintParam(c, "id"))
plan, err := h.svc.ApplyAIPlan(middleware.UserID(c), idParam(c, "id"))
if err != nil {
respondErr(c, err)
return
@@ -103,7 +113,7 @@ func (h *Handler) ApplyAIPlan(c *gin.Context) {
// TogglePlanTask POST /api/plan-tasks/:id/toggle
func (h *Handler) TogglePlanTask(c *gin.Context) {
if err := h.svc.TogglePlanTask(middleware.UserID(c), uintParam(c, "id")); err != nil {
if err := h.svc.TogglePlanTask(middleware.UserID(c), idParam(c, "id")); err != nil {
respondErr(c, err)
return
}
pets-be/internal/handler/record.go
+10 -6
View File
@@ -19,18 +19,22 @@ type recordReq struct {
NumValue float64 `json:"num_value"`
Category string `json:"category"`
ImageURL string `json:"image_url"`
ImageFileID string `json:"image_file_id"`
Extra datatypes.JSON `json:"extra"`
OccurredAt string `json:"occurred_at"`
}
// ListRecords GET /api/pets/:id/records?type=
func (h *Handler) ListRecords(c *gin.Context) {
records, err := h.svc.ListRecords(middleware.UserID(c), uintParam(c, "id"), c.Query("type"))
var pq response.PageQuery
_ = c.ShouldBindQuery(&pq)
pq.Normalize()
records, total, err := h.svc.ListRecords(middleware.UserID(c), idParam(c, "id"), c.Query("type"), pq.Offset(), pq.Limit())
if err != nil {
respondErr(c, err)
return
}
response.OK(c, records)
response.OK(c, response.NewPage(records, total, pq))
}
// CreateRecord POST /api/pets/:id/records
@@ -42,14 +46,14 @@ func (h *Handler) CreateRecord(c *gin.Context) {
}
in := service.RecordInput{
Type: req.Type, Icon: req.Icon, Title: req.Title, Description: req.Description,
NumValue: req.NumValue, Category: req.Category, ImageURL: req.ImageURL, Extra: req.Extra,
NumValue: req.NumValue, Category: req.Category, ImageURL: req.ImageURL, ImageFileID: req.ImageFileID, Extra: req.Extra,
}
if req.OccurredAt != "" {
if t, err := time.Parse(time.RFC3339, req.OccurredAt); err == nil {
in.OccurredAt = &t
}
}
rec, err := h.svc.CreateRecord(middleware.UserID(c), uintParam(c, "id"), in)
rec, err := h.svc.CreateRecord(middleware.UserID(c), idParam(c, "id"), in)
if err != nil {
respondErr(c, err)
return
@@ -59,7 +63,7 @@ func (h *Handler) CreateRecord(c *gin.Context) {
// DeleteRecord DELETE /api/records/:id
func (h *Handler) DeleteRecord(c *gin.Context) {
if err := h.svc.DeleteRecord(middleware.UserID(c), uintParam(c, "id")); err != nil {
if err := h.svc.DeleteRecord(middleware.UserID(c), idParam(c, "id")); err != nil {
respondErr(c, err)
return
}
@@ -68,7 +72,7 @@ func (h *Handler) DeleteRecord(c *gin.Context) {
// WeightTrend GET /api/pets/:id/records/weight-trend
func (h *Handler) WeightTrend(c *gin.Context) {
points, err := h.svc.WeightTrend(middleware.UserID(c), uintParam(c, "id"), 7)
points, err := h.svc.WeightTrend(middleware.UserID(c), idParam(c, "id"), 7)
if err != nil {
respondErr(c, err)
return
pets-be/internal/handler/reminder.go
+4 -4
View File
@@ -19,7 +19,7 @@ type reminderReq struct {
// ListReminders GET /api/pets/:id/reminders
func (h *Handler) ListReminders(c *gin.Context) {
reminders, err := h.svc.ListReminders(middleware.UserID(c), uintParam(c, "id"))
reminders, err := h.svc.ListReminders(middleware.UserID(c), idParam(c, "id"))
if err != nil {
respondErr(c, err)
return
@@ -40,7 +40,7 @@ func (h *Handler) CreateReminder(c *gin.Context) {
in.NextDueDate = &t
}
}
r, err := h.svc.CreateReminder(middleware.UserID(c), uintParam(c, "id"), in)
r, err := h.svc.CreateReminder(middleware.UserID(c), idParam(c, "id"), in)
if err != nil {
respondErr(c, err)
return
@@ -67,7 +67,7 @@ func (h *Handler) UpdateReminder(c *gin.Context) {
fields["next_due_date"] = t
}
}
r, err := h.svc.UpdateReminder(middleware.UserID(c), uintParam(c, "id"), fields)
r, err := h.svc.UpdateReminder(middleware.UserID(c), idParam(c, "id"), fields)
if err != nil {
respondErr(c, err)
return
@@ -77,7 +77,7 @@ func (h *Handler) UpdateReminder(c *gin.Context) {
// DeleteReminder DELETE /api/reminders/:id
func (h *Handler) DeleteReminder(c *gin.Context) {
if err := h.svc.DeleteReminder(middleware.UserID(c), uintParam(c, "id")); err != nil {
if err := h.svc.DeleteReminder(middleware.UserID(c), idParam(c, "id")); err != nil {
respondErr(c, err)
return
}
pets-be/internal/handler/report.go
+4 -4
View File
@@ -9,7 +9,7 @@ import (
// WeeklyReport GET /api/pets/:id/report/weekly
func (h *Handler) WeeklyReport(c *gin.Context) {
rep, err := h.svc.GetWeeklyReport(middleware.UserID(c), uintParam(c, "id"))
rep, err := h.svc.GetWeeklyReport(middleware.UserID(c), idParam(c, "id"))
if err != nil {
respondErr(c, err)
return
@@ -20,7 +20,7 @@ func (h *Handler) WeeklyReport(c *gin.Context) {
// Bill GET /api/pets/:id/bill?period=month
func (h *Handler) Bill(c *gin.Context) {
period := c.DefaultQuery("period", "month")
bill, err := h.svc.GetBill(middleware.UserID(c), uintParam(c, "id"), period)
bill, err := h.svc.GetBill(middleware.UserID(c), idParam(c, "id"), period)
if err != nil {
respondErr(c, err)
return
@@ -30,7 +30,7 @@ func (h *Handler) Bill(c *gin.Context) {
// HealthSummary GET /api/pets/:id/health-summary
func (h *Handler) HealthSummary(c *gin.Context) {
sum, err := h.svc.GetHealthSummary(middleware.UserID(c), uintParam(c, "id"))
sum, err := h.svc.GetHealthSummary(middleware.UserID(c), idParam(c, "id"))
if err != nil {
respondErr(c, err)
return
@@ -40,7 +40,7 @@ func (h *Handler) HealthSummary(c *gin.Context) {
// Poster GET /api/pets/:id/poster
func (h *Handler) Poster(c *gin.Context) {
poster, err := h.svc.GetPoster(middleware.UserID(c), uintParam(c, "id"))
poster, err := h.svc.GetPoster(middleware.UserID(c), idParam(c, "id"))
if err != nil {
respondErr(c, err)
return
pets-be/internal/handler/upload.go
+4 -16
View File
@@ -1,18 +1,13 @@
package handler
import (
"fmt"
"path"
"strings"
"time"
"github.com/gin-gonic/gin"
"github.com/sundynix/pets-be/internal/middleware"
"github.com/sundynix/pets-be/pkg/response"
)
// Upload POST /api/upload multipart/form-data，字段名 file
// Upload POST /api/upload multipart/form-data，字段名 file。
// 按 MD5 去重：相同内容直接返回已有文件，不重复上传。返回 {id,url,md5}。
func (h *Handler) Upload(c *gin.Context) {
fileHeader, err := c.FormFile("file")
if err != nil {
@@ -26,17 +21,10 @@ func (h *Handler) Upload(c *gin.Context) {
}
defer src.Close()
ext := strings.ToLower(path.Ext(fileHeader.Filename))
objectName := fmt.Sprintf("uploads/%d/%d%s", middleware.UserID(c), time.Now().UnixNano(), ext)
contentType := fileHeader.Header.Get("Content-Type")
if contentType == "" {
contentType = "application/octet-stream"
}
url, err := h.svc.Upload(objectName, src, fileHeader.Size, contentType)
f, err := h.svc.UploadFile(src, fileHeader.Filename, fileHeader.Header.Get("Content-Type"))
if err != nil {
response.FailErr(c, err)
return
}
response.OK(c, gin.H{"url": url})
response.OK(c, gin.H{"id": f.ID, "url": f.URL, "md5": f.MD5})
}