update routes

This commit is contained in:
2026-05-16 11:10:36 +07:00
parent f1c69c0f1f
commit f23a0c2152
7 changed files with 64 additions and 39 deletions
+23 -29
View File
@@ -34,11 +34,10 @@ var userFS embed.FS
var adminFS embed.FS
func main() {
// Create a listener on TCP port
lis, err := net.Listen("tcp", ":8080")
if err != nil {
log.Fatalln("Failed to listen:", err)
}
grpcGatewayHost := config.GetGrpcGatewayHost()
userClientHost := config.GetUserClientHost()
adminClientHost := config.GetAdminClientHost()
fileHost := config.GetFileHost()
// Create a gRPC server object
s := grpc.NewServer()
@@ -50,10 +49,6 @@ func main() {
log.Fatalln(err)
}
clientHost := config.GetHost()
adminClientHost := config.GetAdminHost()
fileHost := config.GetFileHost()
cleaner := cleaner.NewCleaner()
formatter := formatter.NewFormatter()
@@ -72,7 +67,7 @@ func main() {
log.Fatalln(err)
}
linkService := link.NewLinkService(clientHost)
linkService := link.NewLinkService(userClientHost)
passwordGenerator := password.NewPasswordGenerator()
@@ -90,12 +85,17 @@ func main() {
),
),
)
// Serve gRPC server
log.Println("Serving gRPC on 0.0.0.0:8080")
// Server gRPC
lis, err := net.Listen("tcp", ":8080")
if err != nil {
log.Fatalln("Failed to listen:", err)
}
go func() {
log.Fatalln(s.Serve(lis))
}()
// Client gRPC
// Create a client connection to the gRPC server we just started
// This is where the gRPC-Gateway proxies the requests
conn, err := grpc.NewClient(
@@ -122,13 +122,12 @@ func main() {
log.Fatalln("Failed to register gateway:", err)
}
// Server gRPC-Gateway
gwServer := &http.Server{
Addr: ":8090",
Addr: config.GrpcGatewayPort,
Handler: cors(gwmux),
}
// Serve gRPC-Gateway server
log.Println("Serving gRPC-Gateway on http://0.0.0.0:8090")
log.Printf("Serving %s for gRPC-Gateway\n", grpcGatewayHost)
go func() {
log.Fatalln(gwServer.ListenAndServe())
}()
@@ -141,23 +140,18 @@ func main() {
fileServerUser := http.FileServer(http.FS(subUserFS))
muxUser.Handle("/", fileServerUser)
// Serve user web server
log.Println("Serving user web on http://0.0.0.0" + config.ClientPort)
// Server user web
log.Printf("Serving %s for user web\n", userClientHost)
go func() {
log.Fatalln(http.ListenAndServe(config.ClientPort, muxUser))
log.Fatalln(http.ListenAndServe(config.UserClientPort, muxUser))
}()
go func() {
dir := "./data/story/images"
// Создаем файловый сервер
fs := http.FileServer(http.Dir(dir))
// Добавляем middleware для логирования
http.Handle("/", loggingMiddleware(fs))
log.Println("Файловый сервер запущен на http://localhost:8120")
log.Println("Обслуживается директория: " + dir)
log.Fatal(http.ListenAndServe(":8120", nil))
log.Printf("Serving %s for file server, directory: %s\n", fileHost, dir)
log.Fatal(http.ListenAndServe(config.FilePort, nil))
}()
muxAdmin := http.NewServeMux()
@@ -168,9 +162,9 @@ func main() {
fileServerAdmin := http.FileServer(http.FS(subAdminFS))
muxAdmin.Handle("/", fileServerAdmin)
// Serve admin web server
log.Printf("Serving admin web on %s\n", adminClientHost)
log.Fatalln(http.ListenAndServe(":8110", muxAdmin))
// Server admin web
log.Printf("Serving %s for admin web \n", adminClientHost)
log.Fatalln(http.ListenAndServe(config.AdminClientPort, muxAdmin))
}
func cors(h http.Handler) http.Handler {