A Q&A platform software for teams at any scales. Whether it's a community forum, help center, or knowledge management platform, you can always count on Apache Answer.
update PermaLink
aichy12698385afe4c7b
diff --git a/docs/docs.go b/docs/docs.goindex 5d69dd2c..d3ca4e4e 100644--- a/docs/docs.go+++ b/docs/docs.go@@ -6475,7 +6475,6 @@ const docTemplate = `{"required": ["contact_email","name",- "permalink","site_url"],"properties": {@@ -6491,11 +6490,6 @@ const docTemplate = `{"type": "string","maxLength": 128},- "permalink": {- "type": "integer",- "maximum": 3,- "minimum": 0- },"short_description": {"type": "string","maxLength": 255@@ -6511,7 +6505,6 @@ const docTemplate = `{"required": ["contact_email","name",- "permalink","site_url"],"properties": {@@ -6527,11 +6520,6 @@ const docTemplate = `{"type": "string","maxLength": 128},- "permalink": {- "type": "integer",- "maximum": 3,- "minimum": 0- },"short_description": {"type": "string","maxLength": 255@@ -6623,9 +6611,15 @@ const docTemplate = `{"schema.SiteSeoReq": {"type": "object","required": [+ "permalink","robots"],"properties": {+ "permalink": {+ "type": "integer",+ "maximum": 3,+ "minimum": 0+ },"robots": {"type": "string"}@@ -6634,9 +6628,15 @@ const docTemplate = `{"schema.SiteSeoResp": {"type": "object","required": [+ "permalink","robots"],"properties": {+ "permalink": {+ "type": "integer",+ "maximum": 3,+ "minimum": 0+ },"robots": {"type": "string"}diff --git a/docs/swagger.json b/docs/swagger.jsonindex 534cccc6..7e73803a 100644--- a/docs/swagger.json+++ b/docs/swagger.json@@ -6463,7 +6463,6 @@"required": ["contact_email","name",- "permalink","site_url"],"properties": {@@ -6479,11 +6478,6 @@"type": "string","maxLength": 128},- "permalink": {- "type": "integer",- "maximum": 3,- "minimum": 0- },"short_description": {"type": "string","maxLength": 255@@ -6499,7 +6493,6 @@"required": ["contact_email","name",- "permalink","site_url"],"properties": {@@ -6515,11 +6508,6 @@"type": "string","maxLength": 128},- "permalink": {- "type": "integer",- "maximum": 3,- "minimum": 0- },"short_description": {"type": "string","maxLength": 255@@ -6611,9 +6599,15 @@"schema.SiteSeoReq": {"type": "object","required": [+ "permalink","robots"],"properties": {+ "permalink": {+ "type": "integer",+ "maximum": 3,+ "minimum": 0+ },"robots": {"type": "string"}@@ -6622,9 +6616,15 @@"schema.SiteSeoResp": {"type": "object","required": [+ "permalink","robots"],"properties": {+ "permalink": {+ "type": "integer",+ "maximum": 3,+ "minimum": 0+ },"robots": {"type": "string"}diff --git a/docs/swagger.yaml b/docs/swagger.yamlindex 6ad1e87c..7107e3bc 100644--- a/docs/swagger.yaml+++ b/docs/swagger.yaml@@ -1200,10 +1200,6 @@ definitions:name:maxLength: 128type: string- permalink:- maximum: 3- minimum: 0- type: integershort_description:maxLength: 255type: string@@ -1213,7 +1209,6 @@ definitions:required:- contact_email- name- - permalink- site_urltype: objectschema.SiteGeneralResp:@@ -1227,10 +1222,6 @@ definitions:name:maxLength: 128type: string- permalink:- maximum: 3- minimum: 0- type: integershort_description:maxLength: 255type: string@@ -1240,7 +1231,6 @@ definitions:required:- contact_email- name- - permalink- site_urltype: objectschema.SiteInterfaceReq:@@ -1299,16 +1289,26 @@ definitions:type: objectschema.SiteSeoReq:properties:+ permalink:+ maximum: 3+ minimum: 0+ type: integerrobots:type: stringrequired:+ - permalink- robotstype: objectschema.SiteSeoResp:properties:+ permalink:+ maximum: 3+ minimum: 0+ type: integerrobots:type: stringrequired:+ - permalink- robotstype: objectschema.SiteWriteReq:diff --git a/internal/controller/template_controller.go b/internal/controller/template_controller.goindex fa659500..3d10aeed 100644--- a/internal/controller/template_controller.go+++ b/internal/controller/template_controller.go@@ -75,6 +75,12 @@ func (tc *TemplateController) SiteInfo(ctx *gin.Context) *schema.TemplateSiteInfif err != nil {log.Error(err)}++ resp.SiteSeo, err = tc.siteInfoService.GetSiteSeo(ctx)+ if err != nil {+ log.Error(err)+ }+resp.Year = fmt.Sprintf("%d", time.Now().Year())return resp}@@ -101,7 +107,7 @@ func (tc *TemplateController) Index(ctx *gin.Context) {siteInfo.Canonical = fmt.Sprintf("%s", siteInfo.General.SiteUrl)UrlUseTitle := false- if siteInfo.General.PermaLink == schema.PermaLinkQuestionIDAndTitle {+ if siteInfo.SiteSeo.PermaLink == schema.PermaLinkQuestionIDAndTitle {UrlUseTitle = true}siteInfo.Title = ""@@ -130,7 +136,7 @@ func (tc *TemplateController) QuestionList(ctx *gin.Context) {siteInfo.Canonical = fmt.Sprintf("%s/questions", siteInfo.General.SiteUrl)UrlUseTitle := false- if siteInfo.General.PermaLink == schema.PermaLinkQuestionIDAndTitle {+ if siteInfo.SiteSeo.PermaLink == schema.PermaLinkQuestionIDAndTitle {UrlUseTitle = true}siteInfo.Title = fmt.Sprintf("Questions - %s", siteInfo.General.Name)@@ -154,7 +160,7 @@ func (tc *TemplateController) QuestionInfo301Jump(ctx *gin.Context, siteInfo *sc}url = fmt.Sprintf("%s/questions/%s", siteInfo.General.SiteUrl, id)- if siteInfo.General.PermaLink == schema.PermaLinkQuestionID {+ if siteInfo.SiteSeo.PermaLink == schema.PermaLinkQuestionID {//not have titleif titleIsAnswerID || len(title) == 0 {return false, ""@@ -219,7 +225,7 @@ func (tc *TemplateController) QuestionInfo(ctx *gin.Context) {}encodeTitle := htmltext.UrlTitle(detail.Title)siteInfo.Canonical = fmt.Sprintf("%s/questions/%s/%s", siteInfo.General.SiteUrl, id, encodeTitle)- if siteInfo.General.PermaLink == schema.PermaLinkQuestionID {+ if siteInfo.SiteSeo.PermaLink == schema.PermaLinkQuestionID {siteInfo.Canonical = fmt.Sprintf("%s/questions/%s", siteInfo.General.SiteUrl, id)}jsonLD := &schema.QAPageJsonLD{}@@ -326,7 +332,7 @@ func (tc *TemplateController) TagInfo(ctx *gin.Context) {siteInfo.Keywords = taginifo.DisplayNameUrlUseTitle := false- if siteInfo.General.PermaLink == schema.PermaLinkQuestionIDAndTitle {+ if siteInfo.SiteSeo.PermaLink == schema.PermaLinkQuestionIDAndTitle {UrlUseTitle = true}siteInfo.Title = fmt.Sprintf("'%s' Questions - %s", taginifo.DisplayName, siteInfo.General.Name)diff --git a/internal/schema/siteinfo_schema.go b/internal/schema/siteinfo_schema.goindex 500ad38e..35d42eb8 100644--- a/internal/schema/siteinfo_schema.go+++ b/internal/schema/siteinfo_schema.go@@ -15,11 +15,11 @@ type SiteGeneralReq struct {Description string `validate:"omitempty,gt=3,lte=2000" form:"description" json:"description"`SiteUrl string `validate:"required,gt=1,lte=512,url" form:"site_url" json:"site_url"`ContactEmail string `validate:"required,gt=1,lte=512,email" form:"contact_email" json:"contact_email"`- PermaLink int `validate:"required,lte=3,gte=0" form:"permalink" json:"permalink"`}type SiteSeoReq struct {- Robots string `validate:"required" form:"robots" json:"robots"`+ PermaLink int `validate:"required,lte=3,gte=0" form:"permalink" json:"permalink"`+ Robots string `validate:"required" form:"robots" json:"robots"`}func (r *SiteGeneralReq) FormatSiteUrl() {@@ -109,6 +109,7 @@ type TemplateSiteInfoResp struct {General *SiteGeneralResp `json:"general"`Interface *SiteInterfaceResp `json:"interface"`Branding *SiteBrandingResp `json:"branding"`+ SiteSeo *SiteSeoReq `json:"siteseo"`Title stringYear stringCanonical stringdiff --git a/internal/service/siteinfo_common/siteinfo_service.go b/internal/service/siteinfo_common/siteinfo_service.goindex 97d6006f..aa371000 100644--- a/internal/service/siteinfo_common/siteinfo_service.go+++ b/internal/service/siteinfo_common/siteinfo_service.go@@ -87,3 +87,16 @@ func (s *SiteInfoCommonService) GetSiteLegal(ctx context.Context) (resp *schema._ = json.Unmarshal([]byte(siteInfo.Content), resp)return resp, nil}++func (s *SiteInfoCommonService) GetSiteSeo(ctx context.Context) (resp *schema.SiteSeoReq, err error) {+ resp = &schema.SiteSeoReq{}+ siteInfo, exist, err := s.siteInfoRepo.GetByType(ctx, constant.SiteTypeSeo)+ if err != nil {+ return nil, err+ }+ if !exist {+ return resp, nil+ }+ _ = json.Unmarshal([]byte(siteInfo.Content), resp)+ return resp, nil+}