diff --git a/apis/system/settings.go b/apis/system/settings.go index 7fe47eeb..f2fdca48 100644 --- a/apis/system/settings.go +++ b/apis/system/settings.go @@ -2,11 +2,11 @@ package system import ( "errors" + "fmt" "github.com/gin-gonic/gin" "go-admin/models" "go-admin/tools" "go-admin/tools/app" - "fmt" "strings" ) @@ -16,21 +16,20 @@ import ( // @Success 200 {string} string "{"code": 200, "message": "添加成功"}" // @Success 200 {string} string "{"code": -1, "message": "添加失败"}" // @Router /api/v1/setting [get] -func QuerySetting(c *gin.Context) { +func GetSetting(c *gin.Context) { var s models.SysSetting - r,e := s.Query() + r, e := s.Get() if r.Logo != "" { - if !strings.HasPrefix(r.Logo,"http") { - r.Logo = fmt.Sprintf("http://%s/%s",c.Request.Host,r.Logo) + if !strings.HasPrefix(r.Logo, "http") { + r.Logo = fmt.Sprintf("http://%s/%s", c.Request.Host, r.Logo) } } tools.HasError(e, "查询失败", 500) - app.OK(c,r,"查询成功") + app.OK(c, r, "查询成功") } - // @Summary 更新或提交系统信息 // @Description 获取JSON // @Tags 系统信息 @@ -40,8 +39,8 @@ func QuerySetting(c *gin.Context) { // @Router /api/v1/system/setting [post] func CreateSetting(c *gin.Context) { var s models.ResponseSystemConfig - if err := c.ShouldBind(&s);err != nil { - app.Error(c,200,errors.New("缺少必要参数"),"") + if err := c.ShouldBind(&s); err != nil { + app.Error(c, 200, errors.New("缺少必要参数"), "") return } @@ -49,18 +48,18 @@ func CreateSetting(c *gin.Context) { sModel.Logo = s.Logo sModel.Name = s.Name - a,e := sModel.Update() + a, e := sModel.Update() if e != nil { - app.Error(c,200,e,"") + app.Error(c, 200, e, "") return } if a.Logo != "" { - if !strings.HasPrefix(a.Logo,"http") { - a.Logo = fmt.Sprintf("http://%s/%s",c.Request.Host,a.Logo) + if !strings.HasPrefix(a.Logo, "http") { + a.Logo = fmt.Sprintf("http://%s/%s", c.Request.Host, a.Logo) } } - app.OK(c,a,"提交成功") + app.OK(c, a, "提交成功") -} \ No newline at end of file +} diff --git a/models/system.go b/models/system.go index 89558df4..31644c3f 100644 --- a/models/system.go +++ b/models/system.go @@ -16,7 +16,7 @@ func (SysSetting) TableName() string { } //查询 -func (s *SysSetting) Query() (create SysSetting, err error) { +func (s *SysSetting) Get() (create SysSetting, err error) { result := orm.Eloquent.Table("sys_setting").First(&create) if result.Error != nil { err = result.Error