🔧 chore(config): update server port and max request body size in config.yaml

📝 fix(main.go): improve error messages and logging for configuration loading

🐳 chore(Dockerfile): update environment variables and improve documentation

📝 refactor(reverse_proxy.go): improve logging for request processing and handle errors

🔒 fix(middleware.go): enhance security headers and improve comments

🔍 fix(config.go): refine error messages and improve config loading logic

📝 refactor(logger.go): update logger initialization to return errors instead of panicking

Author: w7years

Dockerfile

@@ -1,48 +1,48 @@
-# 构建阶段
+# Build stage
 FROM golang:1.23.2-alpine AS builder
 
-# 设置工作目录
+# Set working directory
 WORKDIR /app
 
-# 复制 go.mod 和 go.sum 并下载依赖
+# Copy go.mod and go.sum and download dependencies
 COPY go.mod go.sum ./
 RUN go mod download
 
-# 复制源代码并构建
+# Copy source code and build
 COPY . .
 RUN CGO_ENABLED=0 GOOS=linux go build -o proxy ./cmd/proxy
 
-# 运行阶段
+# Run stage
 FROM alpine:latest
 
-# 安装证书
+# Install certificates
 RUN apk --no-cache add ca-certificates tzdata
 
-# 设置默认时区为上海
+# Set default timezone to Shanghai
 ENV TZ=Asia/Shanghai
 
-# 设置工作目录
+# Set working directory
 WORKDIR /app
 
-# 创建日志目录并设置权限
+# Create logs directory and set permissions
 RUN mkdir -p /app/logs && chmod 755 /app/logs
 
-# 复制可执行文件
+# Copy executable file
 COPY --from=builder /app/proxy .
 COPY --from=builder /app/config.yaml .
 
-# 设置环境变量，指定默认配置文件路径
+# Set environment variables, specify default config file path
 ENV CONFIG_PATH=/app/config.yaml
 ENV PORT=3002
 
-# 复制入口脚本
+# Copy entrypoint script
 COPY entrypoint.sh /app/entrypoint.sh
 RUN chmod +x /app/entrypoint.sh
 
-# 设置时区
+# Set timezone
 RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone
 
 EXPOSE $PORT
 
-# 设置入口点
-ENTRYPOINT ["/app/entrypoint.sh"]
+# Set entrypoint
+ENTRYPOINT ["/app/entrypoint.sh"]

cmd/proxy/main.go

@@ -26,98 +26,100 @@ func main() {
 	configPath := flag.String("config", "config.yaml", "配置文件路径")
 	flag.Parse()
 
-	// 加载配置
+	// Load config
 	cfg, err := config.LoadConfig(*configPath)
 	if err != nil {
-		log.Fatalf("加载配置失败: %v", err)
+		log.Fatalf("Load config failed: %v", err)
 	}
 
-	// 初始化日志
-	logger.InitLogger(cfg)
+	// Initialize logger
+	err = logger.InitLogger(cfg)
+	if err != nil {
+		log.Fatalf("Init logger failed: %v", err)
+	}
 
-	// 设置限流
+	// Set up rate limiting
 	rate, err := limiter.NewRateFromFormatted(cfg.RateLimit)
 	if err != nil {
-		logger.Logger.Fatalf("限流配置错误: %v", err)
+		logger.Logger.Fatalf("Rate limiting config error: %v", err)
 	}
 	store := memory.NewStore()
 	instance := limiter.New(store, rate)
 	limiterMiddleware := ginmiddleware.NewMiddleware(instance)
 
-	// 设置 GIN 为 Release 模式
+	// Set GIN to Release mode
 	gin.SetMode(gin.ReleaseMode)
 
-	// 初始化 Gin 路由
+	// Initialize Gin router
 	router := gin.New()
-	// 添加健康检查路由
+	// Add health check route
 	router.GET("/generate_204", func(c *gin.Context) {
 		logger.Logger.Debugln("generate_204 success.")
 		c.Status(http.StatusNoContent)
 	})
 
-	// 初始化代理
+	// Initialize proxy
 	openAIProxy, err := proxy.NewOpenAIReverseProxy(cfg)
 	if err != nil {
-		logger.Logger.Fatalf("初始化代理失败: %v", err)
+		logger.Logger.Fatalf("Initialize proxy failed: %v", err)
 	}
 
-	// 应用限流中间件
+	// Apply rate limiting middleware
 	apiGroup := router.Group("/")
 	apiGroup.Use(middleware.APIKeyAuthMiddleware())
 	apiGroup.Use(limiterMiddleware)
 	apiGroup.Use(middleware.SecurityHeadersMiddleware())
 	apiGroup.Use(middleware.LimitRequestBody(int64(cfg.MaxRequestBodySizeMB << 20)))
-	//router.Use(middleware.ContentTypeMiddleware(logger.Logger))
 
 	for prefix := range cfg.PathMap {
 		apiGroup.Any(prefix+"/*path", func(c *gin.Context) {
 			openAIProxy.ServeHTTP(c.Writer, c.Request)
 		})
 	}
 
-	// 在主路由器上设置 NoRoute 处理程序
+	// Set NoRoute handler on main router
 	router.NoRoute(func(c *gin.Context) {
-		middleware.ErrorHandler(c.Writer, fmt.Sprintf("未知的路径: %s", c.Request.URL.Path), http.StatusNotFound)
+		middleware.ErrorHandler(c.Writer, fmt.Sprintf("Unknown path: %s", c.Request.URL.Path), http.StatusNotFound)
 	})
 
-	// 设置服务器
+	// Set up server
 	srv := &http.Server{
 		Addr:         ":" + cfg.ServerPort,
 		Handler:      router,
-		ReadTimeout:  10 * time.Second,
-		WriteTimeout: 10 * time.Second,
+		ReadTimeout:  90 * time.Second,
+		WriteTimeout: 90 * time.Second,
 		IdleTimeout:  120 * time.Second,
 	}
 
 	errChan := make(chan error, 1)
 
-	// 等待中断信号
+	// Wait for interrupt signal
 	quit := make(chan os.Signal, 1)
 	signal.Notify(quit, syscall.SIGINT, syscall.SIGTERM)
 
-	// 启动服务器
+	// Start server
 	go func() {
 		if err := srv.ListenAndServe(); err != nil && !errors.Is(err, http.ErrServerClosed) {
-			logger.Logger.Fatalf("无法启动服务器: %v", err)
+			logger.Logger.Fatalf("Failed to start server: %v", err)
 			errChan <- err
 		} else {
-			logger.Logger.Infof("服务启动成功：%s", cfg.ServerPort)
+			logger.Logger.Infof("Server started successfully: %s", cfg.ServerPort)
 		}
 	}()
 
 	select {
 	case <-quit:
-		logger.Logger.Info("收到关闭信号，正在关闭服务器...")
+		logger.Logger.Info("Received shutdown signal, shutting down server...")
 	case err := <-errChan:
-		logger.Logger.Errorf("服务器运行时发生错误: %v", err)
+		logger.Logger.Errorf("Server error: %v", err)
 		quit <- syscall.SIGINT
 	}
 
-	// 优雅关闭
+	// Graceful shutdown
 	ctx, cancel := context.WithTimeout(context.Background(), 10*time.Second)
 	defer cancel()
 	if err := srv.Shutdown(ctx); err != nil {
-		logger.Logger.Fatalf("服务器关闭失败: %v", err)
+		logger.Logger.Fatalf("Server shutdown failed: %v", err)
 	}
-	logger.Logger.Info("服务器已关闭")
+	logger.Logger.Info("Server shutdown")
 }

config.yaml

@@ -1,7 +1,7 @@
-server_port: "3001"
+server_port: "3002"
 rate_limit: "100-M"
 fixed_request_ip: ""
-max_request_body_size_mb: 50
+max_request_body_size_mb: 100
 log_dir: "logs"
 log_name: "app.log"
 log_level: "info"

go.mod

@@ -8,7 +8,6 @@ require (
 	github.com/spf13/viper v1.19.0
 	github.com/stretchr/testify v1.9.0
 	github.com/ulule/limiter/v3 v3.11.2
-	go.uber.org/zap v1.27.0
 )
 
 require (

internal/config/config.go

@@ -6,6 +6,7 @@ import (
 	"github.com/spf13/viper"
 )
 
+// Config config struct
 type Config struct {
 	ServerPort           string            `mapstructure:"server_port"`
 	RateLimit            string            `mapstructure:"rate_limit"`
@@ -17,30 +18,30 @@ type Config struct {
 	PathMap              map[string]string `mapstructure:"path_map"`
 }
 
-// LoadConfig 配置加载
+// LoadConfig load config
 func LoadConfig(configPath string) (*Config, error) {
 	viper.SetConfigType("yaml")
 	viper.SetConfigFile(configPath)
 
-	// 设置默认值
+	// Set default values
 	viper.SetDefault("server_port", "3001")
 	viper.SetDefault("rate_limit", "100-M")
-	viper.SetDefault("max_request_body_size_mb", "20")
+	viper.SetDefault("max_request_body_size_mb", "100")
 	viper.SetDefault("log_dir", "logs")
 	viper.SetDefault("log_name", "app.log")
 	viper.SetDefault("log_level", "info")
 
 	if err := viper.ReadInConfig(); err != nil {
-		return nil, fmt.Errorf("读取配置文件时发生错误: %v", err)
+		return nil, fmt.Errorf("read config file failed: %v", err)
 	}
 
 	var cfg Config
 	if err := viper.Unmarshal(&cfg); err != nil {
-		return nil, fmt.Errorf("无法解析配置: %v", err)
+		return nil, fmt.Errorf("unmarshal config failed: %v", err)
 	}
 
 	if len(cfg.PathMap) == 0 {
-		return nil, fmt.Errorf("路径映射配置为空")
+		return nil, fmt.Errorf("path map config is empty")
 	}
 
 	return &cfg, nil

internal/middleware/middleware.go

@@ -8,7 +8,7 @@ import (
 	"github.com/gin-gonic/gin"
 )
 
-// APIKeyAuthMiddleware 验证请求中的 API 密钥
+// APIKeyAuthMiddleware verify api key
 func APIKeyAuthMiddleware() gin.HandlerFunc {
 	return func(c *gin.Context) {
 		apiKey := c.GetHeader("Authorization")
@@ -24,26 +24,26 @@ func APIKeyAuthMiddleware() gin.HandlerFunc {
 	}
 }
 
-// SecurityHeadersMiddleware 设置安全头
+// SecurityHeadersMiddleware set security headers
 func SecurityHeadersMiddleware() gin.HandlerFunc {
 	return func(c *gin.Context) {
-		// 防止 MIME 类型嗅探攻击。
+		// Prevent MIME type sniffing attacks.
 		c.Writer.Header().Set("X-Content-Type-Options", "nosniff")
-		// 防止点击劫持
+		// Prevent click jacking
 		c.Writer.Header().Set("X-Frame-Options", "DENY")
-		// 防止跨站脚本攻击
+		// Prevent cross-site scripting attacks
 		c.Writer.Header().Set("X-XSS-Protection", "1; mode=block")
-		// 实施内容安全策略（CSP），限制资源加载。
+		// Implement content security policy (CSP), limit resource loading.
 		c.Writer.Header().Set("Content-Security-Policy", "default-src 'none'")
-		// 防止浏览器缓存
+		// Prevent browser caching
 		c.Writer.Header().Set("Cache-Control", "no-store, no-cache, must-revalidate, proxy-revalidate, max-age=0")
 		c.Writer.Header().Set("Pragma", "no-cache")
 		c.Writer.Header().Set("Expires", "0")
 		c.Next()
 	}
 }
 
-// LimitRequestBody 限制请求体大小
+// LimitRequestBody limit request body size
 func LimitRequestBody(maxBytes int64) gin.HandlerFunc {
 	return func(c *gin.Context) {
 		c.Request.Body = http.MaxBytesReader(c.Writer, c.Request.Body, maxBytes)
@@ -56,7 +56,7 @@ func LimitRequestBody(maxBytes int64) gin.HandlerFunc {
 	}
 }
 
-// ErrorHandler 统一的错误处理函数
+// ErrorHandler unified error handling function
 func ErrorHandler(w http.ResponseWriter, errMsg string, statusCode int) {
 	logger.Logger.Error(errMsg)
 	w.Header().Set("Content-Type", "application/json")