diff --git a/CHANGELOG.md b/CHANGELOG.md index 1d1794da..cb7f91bc 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,6 @@ # 更新日志 +## v4.0.8 +* 功能优化：当数据库更新失败的时候记录错误日志 ## v4.0.7 diff --git a/api/handler/admin/api_key_handler.go b/api/handler/admin/api_key_handler.go index 87eab556..58ea37f3 100644 --- a/api/handler/admin/api_key_handler.go +++ b/api/handler/admin/api_key_handler.go @@ -57,6 +57,7 @@ func (h *ApiKeyHandler) Save(c *gin.Context) { apiKey.Name = data.Name res := h.DB.Save(&apiKey) if res.Error != nil { + logger.Error("error with update database：", res.Error) resp.ERROR(c, "更新数据库失败！") return } @@ -83,7 +84,7 @@ func (h *ApiKeyHandler) List(c *gin.Context) { if t != "" { session = session.Where("type", t) } - + var items []model.ApiKey var keys = make([]vo.ApiKey, 0) res := session.Find(&items) @@ -118,6 +119,7 @@ func (h *ApiKeyHandler) Set(c *gin.Context) { res := h.DB.Model(&model.ApiKey{}).Where("id = ?", data.Id).Update(data.Filed, data.Value) if res.Error != nil { + logger.Error("error with update database：", res.Error) resp.ERROR(c, "更新数据库失败！") return } @@ -133,6 +135,7 @@ func (h *ApiKeyHandler) Remove(c *gin.Context) { res := h.DB.Where("id", id).Delete(&model.ApiKey{}) if res.Error != nil { + logger.Error("error with update database：", res.Error) resp.ERROR(c, "更新数据库失败！") return } diff --git a/api/handler/admin/chat_handler.go b/api/handler/admin/chat_handler.go index af76e76e..f51cf85f 100644 --- a/api/handler/admin/chat_handler.go +++ b/api/handler/admin/chat_handler.go @@ -261,6 +261,7 @@ func (h *ChatHandler) RemoveMessage(c *gin.Context) { id := h.GetInt(c, "id", 0) tx := h.DB.Unscoped().Where("id = ?", id).Delete(&model.ChatMessage{}) if tx.Error != nil { + logger.Error("error with update database：", tx.Error) resp.ERROR(c, "更新数据库失败！") return } diff --git a/api/handler/admin/chat_model_handler.go b/api/handler/admin/chat_model_handler.go index f30991a5..dd594b23 100644 --- a/api/handler/admin/chat_model_handler.go +++ b/api/handler/admin/chat_model_handler.go @@ -69,6 +69,7 @@ func (h *ChatModelHandler) Save(c *gin.Context) { res = h.DB.Create(&item) } if res.Error != nil { + logger.Error("error with update database：", res.Error) resp.ERROR(c, "更新数据库失败！") return } @@ -140,6 +141,7 @@ func (h *ChatModelHandler) Set(c *gin.Context) { res := h.DB.Model(&model.ChatModel{}).Where("id = ?", data.Id).Update(data.Filed, data.Value) if res.Error != nil { + logger.Error("error with update database：", res.Error) resp.ERROR(c, "更新数据库失败！") return } @@ -160,6 +162,7 @@ func (h *ChatModelHandler) Sort(c *gin.Context) { for index, id := range data.Ids { res := h.DB.Model(&model.ChatModel{}).Where("id = ?", id).Update("sort_num", data.Sorts[index]) if res.Error != nil { + logger.Error("error with update database：", res.Error) resp.ERROR(c, "更新数据库失败！") return } @@ -177,6 +180,7 @@ func (h *ChatModelHandler) Remove(c *gin.Context) { res := h.DB.Where("id = ?", id).Delete(&model.ChatModel{}) if res.Error != nil { + logger.Error("error with update database：", res.Error) resp.ERROR(c, "更新数据库失败！") return } diff --git a/api/handler/admin/chat_role_handler.go b/api/handler/admin/chat_role_handler.go index 791104a7..3e69ae33 100644 --- a/api/handler/admin/chat_role_handler.go +++ b/api/handler/admin/chat_role_handler.go @@ -48,6 +48,7 @@ func (h *ChatRoleHandler) Save(c *gin.Context) { } res := h.DB.Save(&role) if res.Error != nil { + logger.Error("error with update database：", res.Error) resp.ERROR(c, "更新数据库失败！") return } @@ -115,6 +116,7 @@ func (h *ChatRoleHandler) Sort(c *gin.Context) { for index, id := range data.Ids { res := h.DB.Model(&model.ChatRole{}).Where("id = ?", id).Update("sort_num", data.Sorts[index]) if res.Error != nil { + logger.Error("error with update database：", res.Error) resp.ERROR(c, "更新数据库失败！") return } @@ -137,6 +139,7 @@ func (h *ChatRoleHandler) Set(c *gin.Context) { res := h.DB.Model(&model.ChatRole{}).Where("id = ?", data.Id).Update(data.Filed, data.Value) if res.Error != nil { + logger.Error("error with update database：", res.Error) resp.ERROR(c, "更新数据库失败！") return } @@ -152,6 +155,7 @@ func (h *ChatRoleHandler) Remove(c *gin.Context) { } res := h.DB.Where("id", id).Delete(&model.ChatRole{}) if res.Error != nil { + logger.Error("error with update database：", res.Error) resp.ERROR(c, "删除失败！") return } diff --git a/api/handler/admin/function_handler.go b/api/handler/admin/function_handler.go index 474f32b7..c9e8005f 100644 --- a/api/handler/admin/function_handler.go +++ b/api/handler/admin/function_handler.go @@ -71,6 +71,7 @@ func (h *FunctionHandler) Set(c *gin.Context) { res := h.DB.Model(&model.Function{}).Where("id = ?", data.Id).Update(data.Filed, data.Value) if res.Error != nil { + logger.Error("error with update database：", res.Error) resp.ERROR(c, "更新数据库失败！") return } @@ -103,6 +104,7 @@ func (h *FunctionHandler) Remove(c *gin.Context) { if id > 0 { res := h.DB.Delete(&model.Function{Id: uint(id)}) if res.Error != nil { + logger.Error("error with update database：", res.Error) resp.ERROR(c, "更新数据库失败！") return } diff --git a/api/handler/admin/menu_handler.go b/api/handler/admin/menu_handler.go index ef1991e2..001c601d 100644 --- a/api/handler/admin/menu_handler.go +++ b/api/handler/admin/menu_handler.go @@ -50,6 +50,7 @@ func (h *MenuHandler) Save(c *gin.Context) { Enabled: data.Enabled, }) if res.Error != nil { + logger.Error("error with update database：", res.Error) resp.ERROR(c, "更新数据库失败！") return } @@ -86,6 +87,7 @@ func (h *MenuHandler) Enable(c *gin.Context) { res := h.DB.Model(&model.Menu{}).Where("id", data.Id).UpdateColumn("enabled", data.Enabled) if res.Error != nil { + logger.Error("error with update database：", res.Error) resp.ERROR(c, "更新数据库失败！") return } @@ -106,6 +108,7 @@ func (h *MenuHandler) Sort(c *gin.Context) { for index, id := range data.Ids { res := h.DB.Model(&model.Menu{}).Where("id", id).Update("sort_num", data.Sorts[index]) if res.Error != nil { + logger.Error("error with update database：", res.Error) resp.ERROR(c, "更新数据库失败！") return } @@ -120,6 +123,7 @@ func (h *MenuHandler) Remove(c *gin.Context) { if id > 0 { res := h.DB.Where("id", id).Delete(&model.Menu{}) if res.Error != nil { + logger.Error("error with update database：", res.Error) resp.ERROR(c, "更新数据库失败！") return } diff --git a/api/handler/admin/order_handler.go b/api/handler/admin/order_handler.go index a64fa281..ab6752b6 100644 --- a/api/handler/admin/order_handler.go +++ b/api/handler/admin/order_handler.go @@ -94,6 +94,7 @@ func (h *OrderHandler) Remove(c *gin.Context) { res = h.DB.Unscoped().Where("id = ?", id).Delete(&model.Order{}) if res.Error != nil { + logger.Error("error with update database：", res.Error) resp.ERROR(c, "更新数据库失败！") return } diff --git a/api/handler/admin/product_handler.go b/api/handler/admin/product_handler.go index 92f0d228..e2b66c7d 100644 --- a/api/handler/admin/product_handler.go +++ b/api/handler/admin/product_handler.go @@ -57,6 +57,7 @@ func (h *ProductHandler) Save(c *gin.Context) { } res := h.DB.Save(&item) if res.Error != nil { + logger.Error("error with update database：", res.Error) resp.ERROR(c, "更新数据库失败！") return } @@ -107,6 +108,7 @@ func (h *ProductHandler) Enable(c *gin.Context) { res := h.DB.Model(&model.Product{}).Where("id", data.Id).UpdateColumn("enabled", data.Enabled) if res.Error != nil { + logger.Error("error with update database：", res.Error) resp.ERROR(c, "更新数据库失败！") return } @@ -127,6 +129,7 @@ func (h *ProductHandler) Sort(c *gin.Context) { for index, id := range data.Ids { res := h.DB.Model(&model.Product{}).Where("id", id).Update("sort_num", data.Sorts[index]) if res.Error != nil { + logger.Error("error with update database：", res.Error) resp.ERROR(c, "更新数据库失败！") return } @@ -141,6 +144,7 @@ func (h *ProductHandler) Remove(c *gin.Context) { if id > 0 { res := h.DB.Where("id", id).Delete(&model.Product{}) if res.Error != nil { + logger.Error("error with update database：", res.Error) resp.ERROR(c, "更新数据库失败！") return } diff --git a/api/handler/admin/reward_handler.go b/api/handler/admin/reward_handler.go index 50daa21d..2dc2e281 100644 --- a/api/handler/admin/reward_handler.go +++ b/api/handler/admin/reward_handler.go @@ -72,6 +72,7 @@ func (h *RewardHandler) Remove(c *gin.Context) { if data.Id > 0 { res := h.DB.Where("id = ?", data.Id).Delete(&model.Reward{}) if res.Error != nil { + logger.Error("error with update database：", res.Error) resp.ERROR(c, "更新数据库失败！") return } diff --git a/api/handler/admin/user_handler.go b/api/handler/admin/user_handler.go index 965c06f3..bd9b926b 100644 --- a/api/handler/admin/user_handler.go +++ b/api/handler/admin/user_handler.go @@ -111,6 +111,7 @@ func (h *UserHandler) Save(c *gin.Context) { res = h.DB.Select("username", "status", "vip", "power", "chat_roles_json", "chat_models_json", "expired_time").Updates(&user) if res.Error != nil { + logger.Error("error with update database：", res.Error) resp.ERROR(c, "更新数据库失败！") return } @@ -156,6 +157,7 @@ func (h *UserHandler) Save(c *gin.Context) { } if res.Error != nil { + logger.Error("error with update database：", res.Error) resp.ERROR(c, "更新数据库失败") return } diff --git a/api/handler/chat_role_handler.go b/api/handler/chat_role_handler.go index f246cb37..707e7f4f 100644 --- a/api/handler/chat_role_handler.go +++ b/api/handler/chat_role_handler.go @@ -96,7 +96,7 @@ func (h *ChatRoleHandler) UpdateRole(c *gin.Context) { res := h.DB.Model(&model.User{}).Where("id = ?", user.Id).UpdateColumn("chat_roles_json", utils.JsonEncode(data.Keys)) if res.Error != nil { - logger.Error("添加应用失败：", err) + logger.Error("error with update database：", res.Error) resp.ERROR(c, "更新数据库失败！") return } diff --git a/api/handler/dalle_handler.go b/api/handler/dalle_handler.go index a62fd712..07cd032c 100644 --- a/api/handler/dalle_handler.go +++ b/api/handler/dalle_handler.go @@ -253,6 +253,7 @@ func (h *DallJobHandler) Publish(c *gin.Context) { res := h.DB.Model(&model.DallJob{Id: data.Id}).UpdateColumn("publish", true) if res.Error != nil { + logger.Error("error with update database：", res.Error) resp.ERROR(c, "更新数据库失败") return } diff --git a/api/handler/mj_handler.go b/api/handler/mj_handler.go index 2f210801..822df42a 100644 --- a/api/handler/mj_handler.go +++ b/api/handler/mj_handler.go @@ -8,6 +8,8 @@ package handler // * +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ import ( + "encoding/base64" + "fmt" "geekai/core" "geekai/core/types" "geekai/service" @@ -17,8 +19,6 @@ import ( "geekai/store/vo" "geekai/utils" "geekai/utils/resp" - "encoding/base64" - "fmt" "net/http" "strings" "time" @@ -511,6 +511,7 @@ func (h *MidJourneyHandler) Publish(c *gin.Context) { res := h.DB.Model(&model.MidJourneyJob{Id: data.Id}).UpdateColumn("publish", data.Action) if res.Error != nil { + logger.Error("error with update database：", res.Error) resp.ERROR(c, "更新数据库失败") return } diff --git a/api/handler/reward_handler.go b/api/handler/reward_handler.go index ec019e97..44045f58 100644 --- a/api/handler/reward_handler.go +++ b/api/handler/reward_handler.go @@ -8,13 +8,13 @@ package handler // * +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ import ( + "fmt" "geekai/core" "geekai/core/types" "geekai/store/model" "geekai/store/vo" "geekai/utils" "geekai/utils/resp" - "fmt" "github.com/gin-gonic/gin" "gorm.io/gorm" "math" @@ -73,6 +73,7 @@ func (h *RewardHandler) Verify(c *gin.Context) { res = tx.Model(&user).UpdateColumn("power", gorm.Expr("power + ?", exchange.Power)) if res.Error != nil { tx.Rollback() + logger.Error("添加应用失败：", res.Error) resp.ERROR(c, "更新数据库失败！") return } @@ -84,6 +85,7 @@ func (h *RewardHandler) Verify(c *gin.Context) { res = tx.Updates(&item) if res.Error != nil { tx.Rollback() + logger.Error("添加应用失败：", res.Error) resp.ERROR(c, "更新数据库失败！") return } diff --git a/api/handler/sd_handler.go b/api/handler/sd_handler.go index c4a5c3ef..e30e837d 100644 --- a/api/handler/sd_handler.go +++ b/api/handler/sd_handler.go @@ -8,6 +8,7 @@ package handler // * +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ import ( + "fmt" "geekai/core" "geekai/core/types" "geekai/service" @@ -18,7 +19,6 @@ import ( "geekai/store/vo" "geekai/utils" "geekai/utils/resp" - "fmt" "net/http" "time" @@ -325,6 +325,7 @@ func (h *SdJobHandler) Publish(c *gin.Context) { res := h.DB.Model(&model.SdJob{Id: data.Id}).UpdateColumn("publish", true) if res.Error != nil { + logger.Error("error with update database：", res.Error) resp.ERROR(c, "更新数据库失败") return } diff --git a/api/handler/user_handler.go b/api/handler/user_handler.go index 5df76df1..263a7139 100644 --- a/api/handler/user_handler.go +++ b/api/handler/user_handler.go @@ -349,7 +349,7 @@ func (h *UserHandler) UpdatePass(c *gin.Context) { newPass := utils.GenPassword(data.Password, user.Salt) res := h.DB.Model(&user).UpdateColumn("password", newPass) if res.Error != nil { - logger.Error("更新数据库失败: ", res.Error) + logger.Error("error with update database：", res.Error) resp.ERROR(c, "更新数据库失败") return } @@ -430,6 +430,7 @@ func (h *UserHandler) BindUsername(c *gin.Context) { res = h.DB.Model(&user).UpdateColumn("username", data.Username) if res.Error != nil { + logger.Error(res.Error) resp.ERROR(c, "更新数据库失败") return }