Skip to content

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 'feat/1.1.0/report' into feat/1.1.0/context

LinkinStars0c43b9c7b1c5
diff --cc cmd/wire_gen.go
index 58a7c5ce,89f943bf..61f3e6f4
--- a/cmd/wire_gen.go
+++ b/cmd/wire_gen.go
@@@ -209,9 -209,10 +209,10 @@@ func initApplication(debug bool, server
activityController := controller.NewActivityController(activityCommon, activityService)
roleController := controller_admin.NewRoleController(roleService)
pluginConfigRepo := plugin_config.NewPluginConfigRepo(dataData)
- pluginCommonService := plugin_common.NewPluginCommonService(pluginConfigRepo, configRepo)
+ pluginCommonService := plugin_common.NewPluginCommonService(pluginConfigRepo, configService)
pluginController := controller_admin.NewPluginController(pluginCommonService)
- answerAPIRouter := router.NewAnswerAPIRouter(langController, userController, commentController, reportController, voteController, tagController, followController, collectionController, questionController, answerController, searchController, revisionController, rankController, controller_adminReportController, userAdminController, reasonController, themeController, siteInfoController, siteinfoController, notificationController, dashboardController, uploadController, activityController, roleController, pluginController)
+ permissionController := controller.NewPermissionController(rankService)
+ answerAPIRouter := router.NewAnswerAPIRouter(langController, userController, commentController, reportController, voteController, tagController, followController, collectionController, questionController, answerController, searchController, revisionController, rankController, controller_adminReportController, userAdminController, reasonController, themeController, siteInfoController, siteinfoController, notificationController, dashboardController, uploadController, activityController, roleController, pluginController, permissionController)
swaggerRouter := router.NewSwaggerRouter(swaggerConf)
uiRouter := router.NewUIRouter(siteinfoController, siteInfoCommonService)
authUserMiddleware := middleware.NewAuthUserMiddleware(authService, siteInfoCommonService)
diff --cc internal/repo/notification/notification_repo.go
index 71d5a0a6,21b7bcff..e8f712ec
--- a/internal/repo/notification/notification_repo.go
+++ b/internal/repo/notification/notification_repo.go
@@@ -94,8 -94,9 +94,9 @@@ func (nr *notificationRepo) GetNotifica
return notificationList, 0, nil
}
- session := nr.data.DB.NewSession()
+ session := nr.data.DB.Context(ctx)
session = session.Desc("updated_at")
+
cond := &entity.Notification{
UserID: searchCond.UserID,
Type: searchCond.Type,