diff --git a/docs/docs.go b/docs/docs.go index aed02a1a..0f7f6559 100644 --- a/docs/docs.go +++ b/docs/docs.go @@ -6944,6 +6944,9 @@ const docTemplate = `{ "login": { "$ref": "#/definitions/schema.SiteLoginResp" }, + "siteseo": { + "$ref": "#/definitions/schema.SiteSeoReq" + }, "theme": { "$ref": "#/definitions/schema.SiteThemeResp" } diff --git a/docs/swagger.json b/docs/swagger.json index cdf28f55..e34b4227 100644 --- a/docs/swagger.json +++ b/docs/swagger.json @@ -6932,6 +6932,9 @@ "login": { "$ref": "#/definitions/schema.SiteLoginResp" }, + "siteseo": { + "$ref": "#/definitions/schema.SiteSeoReq" + }, "theme": { "$ref": "#/definitions/schema.SiteThemeResp" } diff --git a/docs/swagger.yaml b/docs/swagger.yaml index 01df6de2..5e7b8ccd 100644 --- a/docs/swagger.yaml +++ b/docs/swagger.yaml @@ -1292,6 +1292,8 @@ definitions: $ref: '#/definitions/schema.SiteInterfaceResp' login: $ref: '#/definitions/schema.SiteLoginResp' + siteseo: + $ref: '#/definitions/schema.SiteSeoReq' theme: $ref: '#/definitions/schema.SiteThemeResp' type: object diff --git a/internal/controller/question_controller.go b/internal/controller/question_controller.go index bca22612..a49ee277 100644 --- a/internal/controller/question_controller.go +++ b/internal/controller/question_controller.go @@ -15,7 +15,6 @@ import ( "github.com/answerdev/answer/pkg/converter" "github.com/gin-gonic/gin" "github.com/segmentfault/pacman/errors" - "github.com/segmentfault/pacman/log" ) // QuestionController question controller @@ -334,19 +333,6 @@ func (qc *QuestionController) UpdateQuestion(ctx *gin.Context) { return } - // TODO: pass errFields and return errors - log.Info(errFields) - - // errMsg := fmt.Sprintf(`The reserved tag "%s" must be present.`, - // strings.Join(CheckOldTaglist, ",")) - // errorlist := make([]*validator.FormErrorField, 0) - // errorlist = append(errorlist, &validator.FormErrorField{ - // ErrorField: "tags", - // ErrorMsg: errMsg, - // }) - // err = errors.BadRequest(reason.RequestFormatError).WithMsg(errMsg) - // return errorlist, err - errlist, err := qc.questionService.UpdateQuestionCheckTags(ctx, req) if err != nil { for _, item := range errlist { diff --git a/internal/controller/siteinfo_controller.go b/internal/controller/siteinfo_controller.go index f5665f96..732a2091 100644 --- a/internal/controller/siteinfo_controller.go +++ b/internal/controller/siteinfo_controller.go @@ -60,6 +60,11 @@ func (sc *SiteinfoController) GetSiteInfo(ctx *gin.Context) { if err != nil { log.Error(err) } + resp.SiteSeo, err = sc.siteInfoService.GetSiteSeo(ctx) + if err != nil { + log.Error(err) + } + handler.HandleResponse(ctx, nil, resp) } diff --git a/internal/schema/siteinfo_schema.go b/internal/schema/siteinfo_schema.go index 94e6786e..d3f80647 100644 --- a/internal/schema/siteinfo_schema.go +++ b/internal/schema/siteinfo_schema.go @@ -162,12 +162,13 @@ type SiteInfoResp struct { Login *SiteLoginResp `json:"login"` Theme *SiteThemeResp `json:"theme"` CustomCssHtml *SiteCustomCssHTMLResp `json:"custom_css_html"` + SiteSeo *SiteSeoReq `json:"site_seo"` } type TemplateSiteInfoResp struct { General *SiteGeneralResp `json:"general"` Interface *SiteInterfaceResp `json:"interface"` Branding *SiteBrandingResp `json:"branding"` - SiteSeo *SiteSeoReq `json:"siteseo"` + SiteSeo *SiteSeoReq `json:"site_seo"` Title string Year string Canonical string