diff --git a/serv_nginx/docker-compose.yml b/serv_nginx/docker-compose.yml index 07fb58b..bc5b125 100644 --- a/serv_nginx/docker-compose.yml +++ b/serv_nginx/docker-compose.yml @@ -97,5 +97,6 @@ networks: web-network: driver: bridge internal: + driver: bridge app-network: name: serv_golang_rest_api_app-network diff --git a/serv_nginx/nginx/nginx-ssl.conf b/serv_nginx/nginx/nginx-ssl.conf index c486516..b4e8174 100644 --- a/serv_nginx/nginx/nginx-ssl.conf +++ b/serv_nginx/nginx/nginx-ssl.conf @@ -31,8 +31,8 @@ server { } # New location for REST API - location /api { - proxy_pass http://api:8080; + location /api/ { + proxy_pass http://api:8080/; proxy_set_header Host $host; proxy_set_header X-Real-IP $remote_addr; proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; diff --git a/serv_nginx/serv_golang_rest_api/internal/handlers/middleware.go b/serv_nginx/serv_golang_rest_api/internal/handlers/middleware.go index 4932f49..fad6890 100644 --- a/serv_nginx/serv_golang_rest_api/internal/handlers/middleware.go +++ b/serv_nginx/serv_golang_rest_api/internal/handlers/middleware.go @@ -1,11 +1,11 @@ package handlers import ( - "net/http" - "time" + "net/http" + "time" - "github.com/go-chi/chi/v5/middleware" - "github.com/go-chi/cors" + "github.com/go-chi/chi/v5/middleware" + "github.com/go-chi/cors" ) func CommonMiddleware() []func(http.Handler) http.Handler { diff --git a/serv_nginx/serv_golang_rest_api/internal/middleware/auth.go b/serv_nginx/serv_golang_rest_api/internal/middleware/auth.go index 2fbac6a..822d330 100644 --- a/serv_nginx/serv_golang_rest_api/internal/middleware/auth.go +++ b/serv_nginx/serv_golang_rest_api/internal/middleware/auth.go @@ -2,10 +2,10 @@ package middleware import ( - "context" - "net/http" - "strings" - "serv_golang_rest_api/internal/utils" + "context" + "net/http" + "serv_golang_rest_api/internal/utils" + "strings" ) func AuthMiddleware(next http.Handler) http.Handler { diff --git a/serv_nginx/serv_golang_rest_api/internal/server/server.go b/serv_nginx/serv_golang_rest_api/internal/server/server.go index 30969c4..c5bc8f3 100644 --- a/serv_nginx/serv_golang_rest_api/internal/server/server.go +++ b/serv_nginx/serv_golang_rest_api/internal/server/server.go @@ -2,6 +2,7 @@ package server import ( "encoding/json" + "fmt" "net/http" "serv_golang_rest_api/internal/handlers" "serv_golang_rest_api/internal/middleware" @@ -37,9 +38,15 @@ func (s *Server) configureRouter(db *gorm.DB) { // API routes s.router.Route("/v1", func(r chi.Router) { - s.router.Get("/check", s.healthCheck) + r.Get("/check", s.healthCheck) s.setupUserRoutes(r, db) }) + + // Для отладки - выводим все маршруты + chi.Walk(s.router, func(method string, route string, handler http.Handler, middlewares ...func(http.Handler) http.Handler) error { + fmt.Printf("[%s] %s\n", method, route) + return nil + }) } func (s *Server) setupUserRoutes(r chi.Router, db *gorm.DB) { @@ -50,9 +57,6 @@ func (s *Server) setupUserRoutes(r chi.Router, db *gorm.DB) { authHandler := &handlers.AuthHandler{DB: db} oauthHandler := &handlers.OAuthHandler{DB: db} - // Health check - r.Get("/health", s.healthCheck) - // Публичные маршруты r.Route("/auth", func(r chi.Router) { r.Post("/register", authHandler.Register)