[Fix] Fix the environment config and PORT number

Signed-off-by: Hsiu-Chi Liu (Tomlord) <aa123593465@gmail.com>

Author: Tomlord1122

cmd/template/dbdriver/files/service/postgres.tmpl

@@ -9,7 +9,6 @@ import (
 	"time"
 
 	"github.com/jackc/pgx/v5/pgxpool"
-	_ "github.com/joho/godotenv/autoload"
 )
 
 // Service represents a service that interacts with a database.
@@ -33,7 +32,7 @@ var (
 	username = os.Getenv("SYMPHONY_DB_USERNAME")
 	port     = os.Getenv("SYMPHONY_DB_PORT")
 	host     = os.Getenv("SYMPHONY_DB_HOST")
-        schema   = os.Getenv("SYMPHONY_DB_SCHEMA")
+	schema   = os.Getenv("SYMPHONY_DB_SCHEMA")
 	dbInstance *service
 )
 

cmd/template/framework/files/globalenv.tmpl

@@ -1,2 +1,3 @@
 PORT=8080
 APP_ENV=local
+FRONT_END_URL=http://localhost:5173

cmd/template/framework/files/main/main.go.tmpl

@@ -8,7 +8,7 @@ import (
 	"os/signal"
 	"syscall"
 	"time"
-
+	 _ "github.com/joho/godotenv/autoload"
 	"{{.ProjectName}}/internal/server"
 )
 

cmd/template/framework/files/routes/gin.go.tmpl

@@ -2,6 +2,7 @@ package server
 
 import (
 	"net/http"
+	"os"
   {{if .AdvancedOptions.websocket}}
 	"log"
 	"fmt"
@@ -15,10 +16,37 @@ import (
 )
 
 func (s *Server) RegisterRoutes() http.Handler {
+	appEnv := os.Getenv("APP_ENV")
+	if appEnv == "" {
+		appEnv = "local"
+	}
+
+	// Set Gin mode based on environment
+	if appEnv == "production" {
+		gin.SetMode(gin.ReleaseMode)
+	} else {
+		gin.SetMode(gin.DebugMode)
+	}
+
 	r := gin.Default()
 
+	// Configure CORS based on environment
+	var allowedOrigins []string
+	frontendURL := os.Getenv("FRONT_END_URL")
+	if frontendURL == "" {
+		frontendURL = "http://localhost:5173" // Default fallback
+	}
+
+	if appEnv == "production" {
+		// In production, use the configured frontend URL
+		allowedOrigins = []string{frontendURL}
+	} else {
+		// In development, allow configured frontend URL plus common development servers
+		allowedOrigins = []string{frontendURL, "http://localhost:3000", "http://localhost:8080"}
+	}
+
 	r.Use(cors.New(cors.Config{
-		AllowOrigins:     []string{"http://localhost:5173", "http://localhost:3000"}, // Add your frontend URL
+		AllowOrigins:     allowedOrigins,
 		AllowMethods:     []string{"GET", "POST", "PUT", "DELETE", "OPTIONS", "PATCH"},
 		AllowHeaders:     []string{"Accept", "Authorization", "Content-Type"},
 		AllowCredentials: true, // Enable cookies/auth

cmd/template/framework/files/server/gin.go.tmpl

@@ -2,6 +2,7 @@ package server
 
 import (
 	"fmt"
+	"log"
 	"net/http"
 	"os"
 	"strconv"
@@ -10,7 +11,6 @@ import (
 	{{- if ne .DBDriver "none" }}
 	"{{.ProjectName}}/internal/database"
 	{{- end }}
-	_ "github.com/joho/godotenv/autoload"
 )
 
 type Server struct {
@@ -22,20 +22,40 @@ type Server struct {
 
 func NewServer() *http.Server {
 	port, _ := strconv.Atoi(os.Getenv("PORT"))
+	appEnv := os.Getenv("APP_ENV")
+	if appEnv == "" {
+		appEnv = "local"
+	}
+	
+	// Log the current environment
+	log.Printf("Starting server in %s environment", appEnv)
+	
 	NewServer := &Server{
 		port: port,
 		{{- if ne .DBDriver "none" }}
 		db: database.New(),
 		{{- end }}
 	}
 
+	// Configure timeouts based on environment
+	var readTimeout, writeTimeout, idleTimeout time.Duration
+	if appEnv == "production" {
+		readTimeout = 30 * time.Second
+		writeTimeout = 60 * time.Second
+		idleTimeout = 5 * time.Minute
+	} else {
+		readTimeout = 10 * time.Second
+		writeTimeout = 30 * time.Second
+		idleTimeout = time.Minute
+	}
+
 	// Declare Server config
 	server := &http.Server{
 		Addr:         fmt.Sprintf(":%d", NewServer.port),
 		Handler:      NewServer.RegisterRoutes(),
-		IdleTimeout:  time.Minute,
-		ReadTimeout:  10 * time.Second,
-		WriteTimeout: 30 * time.Second,
+		IdleTimeout:  idleTimeout,
+		ReadTimeout:  readTimeout,
+		WriteTimeout: writeTimeout,
 	}
 
 	return server

cmd/template/supabase/supabase.go

@@ -1,6 +1,7 @@
 package supabase
 
 import (
+	"bytes"
 	_ "embed"
 	"fmt"
 	"io"
@@ -11,6 +12,7 @@ import (
 	"text/template"
 
 	"github.com/Tomlord1122/go-symphony/cmd/flags"
+	tpl "github.com/Tomlord1122/go-symphony/cmd/template"
 )
 
 //go:embed files/supabase_env.tmpl
@@ -133,7 +135,7 @@ func (sm *SupabaseManager) GetMigrationPath() string {
 	return filepath.Join(sm.ProjectPath, "supabase", "migrations")
 }
 
-// GenerateSupabaseEnv creates .env file with Supabase configuration
+// GenerateSupabaseEnv creates .env file with Supabase configuration including global environment variables
 func (sm *SupabaseManager) GenerateSupabaseEnv() error {
 	envPath := filepath.Join(sm.ProjectPath, ".env")
 
@@ -143,7 +145,14 @@ func (sm *SupabaseManager) GenerateSupabaseEnv() error {
 	}
 	defer file.Close()
 
-	_, err = file.Write(SupabaseEnvTemplate)
+	// Combine global environment template with Supabase-specific template
+	envBytes := [][]byte{
+		tpl.GlobalEnvTemplate(),
+		SupabaseEnvTemplate,
+	}
+
+	combinedTemplate := bytes.Join(envBytes, []byte("\n"))
+	_, err = file.Write(combinedTemplate)
 	if err != nil {
 		return fmt.Errorf("failed to write .env file: %w", err)
 	}