Merge branch 'main' of http://1.117.67.95:3000/team/hyapi-server

internal/container/container.go

@@ -28,6 +28,7 @@ import (
 	domain_product_repo "hyapi-server/internal/domains/product/repositories"
 	product_service "hyapi-server/internal/domains/product/services"
 	statistics_service "hyapi-server/internal/domains/statistics/services"
+	security_service "hyapi-server/internal/domains/security/services"
 	user_service "hyapi-server/internal/domains/user/services"
 	"hyapi-server/internal/infrastructure/cache"
 	"hyapi-server/internal/infrastructure/database"
@@ -534,6 +535,7 @@ func NewContainer() *Container {
 			middleware.NewOptionalAuthMiddleware,
 			middleware.NewAdminAuthMiddleware,
 			middleware.NewDomainAuthMiddleware,
+			middleware.NewManagedIPBlacklistMiddleware,
 			middleware.NewTraceIDMiddleware,
 			middleware.NewErrorTrackingMiddleware,
 			NewRequestBodyLoggerMiddlewareWrapper,
@@ -759,6 +761,7 @@ func NewContainer() *Container {
 
 		// 领域服务
 		fx.Provide(
+			security_service.NewBlacklistService,
 			fx.Annotate(
 				user_service.NewUserAggregateService,
 			),
@@ -874,6 +877,7 @@ func NewContainer() *Container {
 					subscriptionService *product_services.ProductSubscriptionService,
 					exportManager *export.ExportManager,
 					balanceAlertService finance_services.BalanceAlertService,
+					blacklistService *security_service.BlacklistService,
 				) api_app.ApiApplicationService {
 					return api_app.NewApiApplicationService(
 						apiCallService,
@@ -892,6 +896,7 @@ func NewContainer() *Container {
 						subscriptionService,
 						exportManager,
 						balanceAlertService,
+						blacklistService,
 					)
 				},
 				fx.As(new(api_app.ApiApplicationService)),
@@ -1335,6 +1340,7 @@ func NewContainer() *Container {
 			handlers.NewStatisticsHandler,
 			// 管理员安全HTTP处理器
 			handlers.NewAdminSecurityHandler,
+			handlers.NewAdminBlacklistHandler,
 			// 文章HTTP处理器
 			func(
 				appService article.ArticleApplicationService,
@@ -1428,6 +1434,7 @@ func NewContainer() *Container {
 			routes.NewStatisticsRoutes,
 			// 管理员安全路由
 			routes.NewAdminSecurityRoutes,
+			routes.NewAdminBlacklistRoutes,
 			// PDFG路由
 			routes.NewPDFGRoutes,
 			// 企业报告页面路由
@@ -1509,6 +1516,7 @@ func RegisterMiddlewares(
 	responseTime *middleware.ResponseTimeMiddleware,
 	cors *middleware.CORSMiddleware,
 	rateLimit *middleware.RateLimitMiddleware,
+	managedIPBlacklist *middleware.ManagedIPBlacklistMiddleware,
 	dailyRateLimit *middleware.DailyRateLimitMiddleware,
 	requestLogger *middleware.RequestLoggerMiddleware,
 	traceIDMiddleware *middleware.TraceIDMiddleware,
@@ -1523,6 +1531,7 @@ func RegisterMiddlewares(
 	router.RegisterMiddleware(responseTime)
 	router.RegisterMiddleware(cors)
 	router.RegisterMiddleware(rateLimit)
+	router.RegisterMiddleware(managedIPBlacklist)
 	router.RegisterMiddleware(dailyRateLimit)
 	router.RegisterMiddleware(requestLogger)
 	router.RegisterMiddleware(traceIDMiddleware)
@@ -1547,6 +1556,7 @@ func RegisterRoutes(
 	apiRoutes *routes.ApiRoutes,
 	statisticsRoutes *routes.StatisticsRoutes,
 	adminSecurityRoutes *routes.AdminSecurityRoutes,
+	adminBlacklistRoutes *routes.AdminBlacklistRoutes,
 	pdfgRoutes *routes.PDFGRoutes,
 	qyglReportRoutes *routes.QYGLReportRoutes,
 	jwtAuth *middleware.JWTAuthMiddleware,
@@ -1574,6 +1584,7 @@ func RegisterRoutes(
 	announcementRoutes.Register(router)
 	statisticsRoutes.Register(router)
 	adminSecurityRoutes.Register(router)
+	adminBlacklistRoutes.Register(router)
 	pdfgRoutes.Register(router)
 	qyglReportRoutes.Register(router)