diff --git a/api/config.sample.toml b/api/config.sample.toml index b89ca439..700b122c 100644 --- a/api/config.sample.toml +++ b/api/config.sample.toml @@ -10,10 +10,6 @@ WeChatBot = false SecretKey = "azyehq3ivunjhbntz78isj00i4hz2mt9xtddysfucxakadq4qbfrt0b7q3lnvg80" # 注意:这个是 JWT Token 授权密钥,生产环境请务必更换 MaxAge = 86400 -[Manager] - Username = "admin" - Password = "admin123" # 如果是生产环境的话,这里管理员的密码记得修改 - [Redis] # redis 配置信息 Host = "localhost" Port = 6379 diff --git a/api/handler/admin/api_key_handler.go b/api/handler/admin/api_key_handler.go index 63a147f3..e4b65d2d 100644 --- a/api/handler/admin/api_key_handler.go +++ b/api/handler/admin/api_key_handler.go @@ -109,10 +109,15 @@ func (h *ApiKeyHandler) Set(c *gin.Context) { } func (h *ApiKeyHandler) Remove(c *gin.Context) { - id := h.GetInt(c, "id", 0) - - if id > 0 { - res := h.db.Where("id = ?", id).Delete(&model.ApiKey{}) + var data struct { + Id uint + } + if err := c.ShouldBindJSON(&data); err != nil { + resp.ERROR(c, types.InvalidArgs) + return + } + if data.Id > 0 { + res := h.db.Where("id = ?", data.Id).Delete(&model.ApiKey{}) if res.Error != nil { resp.ERROR(c, "更新数据库失败!") return diff --git a/api/handler/admin/chat_model_handler.go b/api/handler/admin/chat_model_handler.go index 2a9e41b5..1fb9fdc7 100644 --- a/api/handler/admin/chat_model_handler.go +++ b/api/handler/admin/chat_model_handler.go @@ -140,10 +140,15 @@ func (h *ChatModelHandler) Sort(c *gin.Context) { } func (h *ChatModelHandler) Remove(c *gin.Context) { - id := h.GetInt(c, "id", 0) - - if id > 0 { - res := h.db.Where("id = ?", id).Delete(&model.ChatModel{}) + var data struct { + Id uint + } + if err := c.ShouldBindJSON(&data); err != nil { + resp.ERROR(c, types.InvalidArgs) + return + } + if data.Id > 0 { + res := h.db.Where("id = ?", data.Id).Delete(&model.ChatModel{}) if res.Error != nil { resp.ERROR(c, "更新数据库失败!") return diff --git a/api/handler/admin/chat_role_handler.go b/api/handler/admin/chat_role_handler.go index f7c5ba1a..233d8434 100644 --- a/api/handler/admin/chat_role_handler.go +++ b/api/handler/admin/chat_role_handler.go @@ -119,13 +119,18 @@ func (h *ChatRoleHandler) Set(c *gin.Context) { } func (h *ChatRoleHandler) Remove(c *gin.Context) { - id := h.GetInt(c, "id", 0) - if id <= 0 { + var data struct { + Id uint + } + if err := c.ShouldBindJSON(&data); err != nil { resp.ERROR(c, types.InvalidArgs) return } - - res := h.db.Where("id = ?", id).Delete(&model.ChatRole{}) + if data.Id <= 0 { + resp.ERROR(c, types.InvalidArgs) + return + } + res := h.db.Where("id = ?", data.Id).Delete(&model.ChatRole{}) if res.Error != nil { resp.ERROR(c, "删除失败!") return diff --git a/api/handler/admin/reward_handler.go b/api/handler/admin/reward_handler.go index def4cf87..a9d05bea 100644 --- a/api/handler/admin/reward_handler.go +++ b/api/handler/admin/reward_handler.go @@ -2,6 +2,7 @@ package admin import ( "chatplus/core" + "chatplus/core/types" "chatplus/handler" "chatplus/store/model" "chatplus/store/vo" @@ -57,10 +58,15 @@ func (h *RewardHandler) List(c *gin.Context) { } func (h *RewardHandler) Remove(c *gin.Context) { - id := h.GetInt(c, "id", 0) - - if id > 0 { - res := h.db.Where("id = ?", id).Delete(&model.Reward{}) + var data struct { + Id uint + } + if err := c.ShouldBindJSON(&data); err != nil { + resp.ERROR(c, types.InvalidArgs) + return + } + if data.Id > 0 { + res := h.db.Where("id = ?", data.Id).Delete(&model.Reward{}) if res.Error != nil { resp.ERROR(c, "更新数据库失败!") return diff --git a/api/handler/admin/user_handler.go b/api/handler/admin/user_handler.go index 1366bff4..b84fdf54 100644 --- a/api/handler/admin/user_handler.go +++ b/api/handler/admin/user_handler.go @@ -154,30 +154,36 @@ func (h *UserHandler) ResetPass(c *gin.Context) { } func (h *UserHandler) Remove(c *gin.Context) { - id := h.GetInt(c, "id", 0) - if id > 0 { + var data struct { + Id uint + } + if err := c.ShouldBindJSON(&data); err != nil { + resp.ERROR(c, types.InvalidArgs) + return + } + if data.Id > 0 { tx := h.db.Begin() - res := h.db.Where("id = ?", id).Delete(&model.User{}) + res := h.db.Where("id = ?", data.Id).Delete(&model.User{}) if res.Error != nil { resp.ERROR(c, "删除失败") return } // 删除聊天记录 - res = h.db.Where("user_id = ?", id).Delete(&model.ChatItem{}) + res = h.db.Where("user_id = ?", data.Id).Delete(&model.ChatItem{}) if res.Error != nil { tx.Rollback() resp.ERROR(c, "删除失败") return } // 删除聊天历史记录 - res = h.db.Where("user_id = ?", id).Delete(&model.ChatMessage{}) + res = h.db.Where("user_id = ?", data.Id).Delete(&model.ChatMessage{}) if res.Error != nil { tx.Rollback() resp.ERROR(c, "删除失败") return } // 删除登录日志 - res = h.db.Where("user_id = ?", id).Delete(&model.UserLoginLog{}) + res = h.db.Where("user_id = ?", data.Id).Delete(&model.UserLoginLog{}) if res.Error != nil { tx.Rollback() resp.ERROR(c, "删除失败") diff --git a/api/main.go b/api/main.go index 0bf3f6e0..545fa7ed 100644 --- a/api/main.go +++ b/api/main.go @@ -273,13 +273,13 @@ func main() { group.POST("save", h.Save) group.GET("list", h.List) group.POST("set", h.Set) - group.GET("remove", h.Remove) + group.POST("remove", h.Remove) }), fx.Invoke(func(s *core.AppServer, h *admin.UserHandler) { group := s.Engine.Group("/api/admin/user/") group.GET("list", h.List) group.POST("save", h.Save) - group.GET("remove", h.Remove) + group.POST("remove", h.Remove) group.GET("loginLog", h.LoginLog) group.POST("resetPass", h.ResetPass) }), @@ -289,12 +289,12 @@ func main() { group.POST("save", h.Save) group.POST("sort", h.Sort) group.POST("set", h.Set) - group.GET("remove", h.Remove) + group.POST("remove", h.Remove) }), fx.Invoke(func(s *core.AppServer, h *admin.RewardHandler) { group := s.Engine.Group("/api/admin/reward/") group.GET("list", h.List) - group.GET("remove", h.Remove) + group.POST("remove", h.Remove) }), fx.Invoke(func(s *core.AppServer, h *admin.DashboardHandler) { group := s.Engine.Group("/api/admin/dashboard/") @@ -310,7 +310,7 @@ func main() { group.GET("list", h.List) group.POST("set", h.Set) group.POST("sort", h.Sort) - group.GET("remove", h.Remove) + group.POST("remove", h.Remove) }), fx.Invoke(func(s *core.AppServer, h *handler.PaymentHandler) { group := s.Engine.Group("/api/payment/") diff --git a/deploy/conf/config.toml b/deploy/conf/config.toml index e3c9fa17..5f89d4c9 100644 --- a/deploy/conf/config.toml +++ b/deploy/conf/config.toml @@ -10,10 +10,6 @@ WeChatBot = false SecretKey = "azyehq3ivunjhbntz78isj00i4hz2mt9xtddysfucxakadq4qbfrt0b7q3lnvg80" # 注意:这个是 JWT Token 授权密钥,生产环境请务必更换 MaxAge = 86400 -[Manager] - Username = "admin" - Password = "admin123" # 如果是生产环境的话,这里管理员的密码记得修改 - [Redis] # redis 配置信息 Host = "localhost" Port = 6379