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.
Merge branch 'github-main' into feat/1.2.0/state
LinkinStarsc49fa005704e
diff --cc cmd/wire_gen.goindex 91844aad,1c237435..96352e61--- a/cmd/wire_gen.go+++ b/cmd/wire_gen.go@@@ -169,16 -165,17 +169,16 @@@ func initApplication(debug bool, serveranswerCommon := answercommon.NewAnswerCommon(answerRepo)metaRepo := meta.NewMetaRepo(dataData)metaService := meta2.NewMetaService(metaRepo)- questionCommon := questioncommon.NewQuestionCommon(questionRepo, answerRepo, voteRepo, followRepo, tagCommonService, userCommon, collectionCommon, answerCommon, metaService, configService, activityQueueService)- questionCommon := questioncommon.NewQuestionCommon(questionRepo, answerRepo, voteRepo, followRepo, tagCommonService, userCommon, collectionCommon, answerCommon, metaService, configService, dataData)++ questionCommon := questioncommon.NewQuestionCommon(questionRepo, answerRepo, voteRepo, followRepo, tagCommonService, userCommon, collectionCommon, answerCommon, metaService, configService, activityQueueService, dataData)collectionService := service.NewCollectionService(collectionRepo, collectionGroupRepo, questionCommon)collectionController := controller.NewCollectionController(collectionService)- answerActivityRepo := activity.NewAnswerActivityRepo(dataData, activityRepo, userRankRepo)+ answerActivityRepo := activity.NewAnswerActivityRepo(dataData, activityRepo, userRankRepo, notificationQueueService)questionActivityRepo := activity.NewQuestionActivityRepo(dataData, activityRepo, userRankRepo)answerActivityService := activity2.NewAnswerActivityService(answerActivityRepo, questionActivityRepo)- questionService := service.NewQuestionService(questionRepo, tagCommonService, questionCommon, userCommon, userRepo, revisionService, metaService, collectionCommon, answerActivityService, dataData, emailService)- answerService := service.NewAnswerService(answerRepo, questionRepo, questionCommon, userCommon, collectionCommon, userRepo, revisionService, answerActivityService, answerCommon, voteRepo, emailService, userRoleRelService)- questionController := controller.NewQuestionController(questionService, answerService, rankService)- dashboardService := dashboard.NewDashboardService(questionRepo, answerRepo, commentCommonRepo, voteRepo, userRepo, reportRepo, configService, siteInfoCommonService, serviceConf, dataData)- answerController := controller.NewAnswerController(answerService, rankService, dashboardService)+ questionService := service.NewQuestionService(questionRepo, tagCommonService, questionCommon, userCommon, userRepo, revisionService, metaService, collectionCommon, answerActivityService, dataData, emailService, notificationQueueService, activityQueueService)+ answerService := service.NewAnswerService(answerRepo, questionRepo, questionCommon, userCommon, collectionCommon, userRepo, revisionService, answerActivityService, answerCommon, voteRepo, emailService, userRoleRelService, notificationQueueService, activityQueueService)+ questionController := controller.NewQuestionController(questionService, answerService, rankService, siteInfoCommonService)+ answerController := controller.NewAnswerController(answerService, rankService)searchParser := search_parser.NewSearchParser(tagCommonService, userCommon)searchRepo := search_common.NewSearchRepo(dataData, uniqueIDRepo, userCommon)searchService := service.NewSearchService(searchParser, searchRepo)@@@ -196,17 -193,16 +196,17 @@@reasonService := reason2.NewReasonService(reasonRepo)reasonController := controller.NewReasonController(reasonService)themeController := controller_admin.NewThemeController()- siteInfoService := siteinfo.NewSiteInfoService(siteInfoRepo, siteInfoCommonService, emailService, tagCommonService, configService)+ siteInfoService := siteinfo.NewSiteInfoService(siteInfoRepo, siteInfoCommonService, emailService, tagCommonService, configService, questionCommon)siteInfoController := controller_admin.NewSiteInfoController(siteInfoService)- siteinfoController := controller.NewSiteinfoController(siteInfoCommonService)+ controllerSiteInfoController := controller.NewSiteInfoController(siteInfoCommonService)notificationRepo := notification.NewNotificationRepo(dataData)- notificationCommon := notificationcommon.NewNotificationCommon(dataData, notificationRepo, userCommon, activityRepo, followRepo, objService)+ notificationCommon := notificationcommon.NewNotificationCommon(dataData, notificationRepo, userCommon, activityRepo, followRepo, objService, notificationQueueService)notificationService := notification2.NewNotificationService(dataData, notificationRepo, notificationCommon, revisionService)notificationController := controller.NewNotificationController(notificationService, rankService)+ dashboardService := dashboard.NewDashboardService(questionRepo, answerRepo, commentCommonRepo, voteRepo, userRepo, reportRepo, configService, siteInfoCommonService, serviceConf, dataData)dashboardController := controller.NewDashboardController(dashboardService)uploadController := controller.NewUploadController(uploaderService)- activityCommon := activity_common2.NewActivityCommon(activityRepo)+ activityCommon := activity_common2.NewActivityCommon(activityRepo, activityQueueService)activityActivityRepo := activity.NewActivityRepo(dataData, configService)commentCommonService := comment_common.NewCommentCommonService(commentCommonRepo)activityService := activity2.NewActivityService(activityActivityRepo, userCommon, activityCommon, tagCommonService, objService, commentCommonService, revisionService, metaService, configService)diff --cc internal/controller/template_render/question.goindex fc0e5bab,6504d7e9..4b6b023f--- a/internal/controller/template_render/question.go+++ b/internal/controller/template_render/question.go@@@ -6,6 -6,6 +6,7 @@@ import"html/template""net/http"++ "github.com/answerdev/answer/internal/base/constant""github.com/answerdev/answer/internal/schema""github.com/gin-gonic/gin""github.com/segmentfault/pacman/log"@@@ -32,6 -37,10 +38,10 @@@ func (t *TemplateRenderController) Sitelog.Errorf("get Cache failed: %s", err)return}+ hasTitle := false- if siteInfo.PermaLink == schema.PermaLinkQuestionIDAndTitle || siteInfo.PermaLink == schema.PermaLinkQuestionIDAndTitleByShortID {++ if siteInfo.PermaLink == constant.PermaLinkQuestionIDAndTitle || siteInfo.PermaLink == constant.PermaLinkQuestionIDAndTitleByShortID {+ hasTitle = true+ }if err = json.Unmarshal([]byte(infoStr), sitemapInfo); err != nil {log.Errorf("get sitemap info failed: %s", err)return@@@ -68,6 -78,15 +79,15 @@@ func (t *TemplateRenderController) Sitelog.Error("get site general failed:", err)return err}+ siteInfo, err := t.siteInfoService.GetSiteSeo(ctx)+ if err != nil {+ log.Error("get site GetSiteSeo failed:", err)+ return err+ }+ hasTitle := false- if siteInfo.PermaLink == schema.PermaLinkQuestionIDAndTitle || siteInfo.PermaLink == schema.PermaLinkQuestionIDAndTitleByShortID {++ if siteInfo.PermaLink == constant.PermaLinkQuestionIDAndTitle || siteInfo.PermaLink == constant.PermaLinkQuestionIDAndTitleByShortID {+ hasTitle = true+ }cachekey := fmt.Sprintf(schema.SitemapPageCachekey, page)infoStr, err := t.data.Cache.GetString(ctx, cachekey)diff --cc internal/service/question_common/question.goindex 19ced89b,b0ccc4cc..2f8a9073--- a/internal/service/question_common/question.go+++ b/internal/service/question_common/question.go@@@ -54,17 -57,17 +57,18 @@@ type QuestionRepo interface// QuestionCommon user servicetype QuestionCommon struct {- questionRepo QuestionRepo- answerRepo answercommon.AnswerRepo- voteRepo activity_common.VoteRepo- followCommon activity_common.FollowRepo- tagCommon *tagcommon.TagCommonService- userCommon *usercommon.UserCommon- collectionCommon *collectioncommon.CollectionCommon- AnswerCommon *answercommon.AnswerCommon- metaService *meta.MetaService- configService *config.ConfigService+ questionRepo QuestionRepo+ answerRepo answercommon.AnswerRepo+ voteRepo activity_common.VoteRepo+ followCommon activity_common.FollowRepo+ tagCommon *tagcommon.TagCommonService+ userCommon *usercommon.UserCommon+ collectionCommon *collectioncommon.CollectionCommon+ AnswerCommon *answercommon.AnswerCommon+ metaService *meta.MetaService+ configService *config.ConfigService+ activityQueueService activity_queue.ActivityQueueService+ data *data.Data}func NewQuestionCommon(questionRepo QuestionRepo,@@@ -77,20 -80,21 +81,22 @@@answerCommon *answercommon.AnswerCommon,metaService *meta.MetaService,configService *config.ConfigService,+ activityQueueService activity_queue.ActivityQueueService,+ data *data.Data,-) *QuestionCommon {return &QuestionCommon{- questionRepo: questionRepo,- answerRepo: answerRepo,- voteRepo: voteRepo,- followCommon: followCommon,- tagCommon: tagCommon,- userCommon: userCommon,- collectionCommon: collectionCommon,- AnswerCommon: answerCommon,- metaService: metaService,- configService: configService,+ questionRepo: questionRepo,+ answerRepo: answerRepo,+ voteRepo: voteRepo,+ followCommon: followCommon,+ tagCommon: tagCommon,+ userCommon: userCommon,+ collectionCommon: collectionCommon,+ AnswerCommon: answerCommon,+ metaService: metaService,+ configService: configService,+ activityQueueService: activityQueueService,+ data: data,}}diff --cc internal/service/siteinfo/siteinfo_service.goindex fd844201,5d0fc294..70ddadba--- a/internal/service/siteinfo/siteinfo_service.go+++ b/internal/service/siteinfo/siteinfo_service.go@@@ -13,8 -13,10 +13,9 @@@ import"github.com/answerdev/answer/internal/schema""github.com/answerdev/answer/internal/service/config""github.com/answerdev/answer/internal/service/export"+ questioncommon "github.com/answerdev/answer/internal/service/question_common""github.com/answerdev/answer/internal/service/siteinfo_common"tagcommon "github.com/answerdev/answer/internal/service/tag_common"- "github.com/answerdev/answer/pkg/uid""github.com/answerdev/answer/plugin""github.com/jinzhu/copier""github.com/segmentfault/pacman/errors"