Merge pull request #79 from WJQSERVER-STUDIO/dev

2.6.2 - 2025-03-29 --- - BACKPORT: 反向移植前端资源加载改进
2.6.2
2025-03-29 11:08:46 +08:00 · 2025-03-29 11:02:54 +08:00 · 2025-03-28 10:41:02 +08:00 · 2025-03-28 08:20:29 +08:00 · 2025-03-27 12:17:35 +08:00 · 2025-03-27 12:01:27 +08:00
27 changed files with 749 additions and 606 deletions
--- a/.github/workflows/build-dev.yml
+++ b/.github/workflows/build-dev.yml
@@ -59,11 +59,13 @@ jobs:
          else
            echo "DEV-VERSION file not found!" && exit 1
          fi
+
      - name: 拉取前端
        run: |
          sudo git clone https://github.com/WJQSERVER-STUDIO/GHPrxoy-Frontend.git pages
          sudo rm -rf pages/.git/
-          
+  
+
      - name: 安装 Go
        uses: actions/setup-go@v3
        with:
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -56,11 +56,12 @@ jobs:
          else
            echo "VERSION file not found!" && exit 1
          fi
+
      - name: 拉取前端
        run: |
          sudo git clone https://github.com/WJQSERVER-STUDIO/GHPrxoy-Frontend.git pages
          sudo rm -rf pages/.git/
-          
+
      - name: 安装 Go
        uses: actions/setup-go@v3
        with:
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,8 +1,63 @@
 # 更新日志

-3.0.2 - 2025-03-21
+2.6.2 - 2025-03-29
 ---
- RELEASE: 在此表达对各位的歉意, v3迁移到HertZ带来了许多问题; 此版本完善v3的同时, 修正已知问题; v3会与v2.4.0及以上版本保证兼容关系, 可平顺升级;
+- BACKPORT: 反向移植前端资源加载改进
+
+e3.0.6 - 2025-03-28
+---
+- ATTENTION: 此版本是实验性的, 请确保了解这一点
+- FIX: 修正状态码相关问题(开发遗留所致)
+
+e3.0.5 - 2025-03-28
+---
+- ATTENTION: 此版本是实验性的, 请确保了解这一点
+- CHANGE: 增加默认配置生成
+- CHANGE: 优化前端资源加载
+
+2.6.1 - 2025-03-27
+---
+- CHANGE: 改进`matcher`组件
+- CHANGE: 加入优雅关闭
+
+e3.0.3 - 2025-03.27
+---
+- ATTENTION: 此版本是实验性的, 请确保了解这一点
+- E-RELEASE: 修正过往问题, 还请各位多多测试反馈
+- PORT: 从v2移植`matcher`相关改进
+- CHANGE&FIX: 使用`c.SetBodyStream`方式, 修正此前`chunked`传输中存在的诸多问题, 参看[HertZ Issues #1309](https://github.com/cloudwego/hertz/issues/1309)
+
+25w24a - 2025-03-27
+---
+- PRE-RELEASE: 此版本是v2.6.1的预发布版本,请勿在生产环境中使用;
+- CHANGE: 改进`matcher`组件
+- CHANGE: 加入优雅关闭
+
+e3.0.3rc2 - 2025-03-27
+---
+- ATTENTION: 此版本是实验性的, 请确保了解这一点
+- PRE-RELEASE: 此版本是v3.0.3的候选版本,请勿在生产环境中使用;
+- PORT: 从v2移植`matcher`相关改进
+
+e3.0.3rc1 - 2025-03-26
+---
+- ATTENTION: 此版本是实验性的, 请确保了解这一点
+- PRE-RELEASE: 此版本是v3.0.3的候选版本,请勿在生产环境中使用;
+- CHANGE&FIX: 使用`c.SetBodyStream`方式, 修正此前`chunked`传输中存在的诸多问题, 参看[HertZ Issues #1309](https://github.com/cloudwego/hertz/issues/1309)
+
+2.6.0 - 2025-03-22
+---
+- BACKPORT: 将v3的功能性改进反向移植
+
+25w23a - 2025-03-22
+---
+- PRE-RELEASE: 此版本是v2.6.0的预发布版本,请勿在生产环境中使用;
+- BACKPORT: 将v3的功能性改进反向移植
+
+e3.0.2 - 2025-03-21
+---
+- ATTENTION: 此版本是实验性的, 请确保了解这一点
+- RELEASE: 在此表达对各位的歉意, v3迁移到HertZ带来了许多问题; 此版本完善v3的同时, 修正已知问题;
 - FIX: 使用等效`c.Writer()`, 回归v2.5.0 func以修正问题
 - CHANGE: 更新相关依赖

@@ -11,9 +66,10 @@
 - PRE-RELEASE: 此版本是v3.0.1的预发布版本,请勿在生产环境中使用;
 - FIX: 使用等效`c.Writer()`, 回归v2.5.0 func以修正问题

-3.0.1 - 2025-03-21
+e3.0.1 - 2025-03-21
 ---
- RELEASE: Next Step; 下一步; 完善v3的同时, 修正已知问题; v3会与v2.4.0及以上版本保证兼容关系, 可平顺升级;
+- ATTENTION: 此版本是实验性的, 请确保了解这一点
+- RELEASE: Next Step; 下一步; 完善v3的同时, 修正已知问题;
 - CHANGE: 改进cli
 - CHANGE: 重写`ProcessLinksAndWriteChunked`(脚本嵌套加速处理器), 修正已知问题的同时提高性能与效率
 - CHANGE: 完善`gitreq`部分
@@ -46,8 +102,9 @@
 - CHANGE: 改进cli
 - CHANGE: 完善`gitreq`部分

-3.0.0 - 2025-03-19
+e3.0.0 - 2025-03-19
 ---
+- ATTENTION: 此版本是实验性的, 请确保了解这一点
 - RELEASE: Next Gen; 下一个起点; v3会与v2.4.0及以上版本保证兼容关系, 可平顺升级;
 - CHANGE: 使用HertZ框架重构, 提升性能
 - CHANGE: 前端在构建时加入, 新增`Design`,`Metro`,`Classic`主题
@@ -1161,4 +1218,4 @@ v0.1.0
 - ADD: 实现符合[RFC 7234](https://httpwg.org/specs/rfc7234.html)的HTTP缓存机制
 - ADD: 实现action编译
 - ADD: 实现Docker部署
- INFO: 使用Caddy作为Web服务器，通过Caddy实现了缓存与速率限制
+- INFO: 使用Caddy作为Web服务器，通过Caddy实现了缓存与速率限制
--- a/2
+++ b/2
@@ -1 +1 @@
-25w22a
+25w24a
--- a/README.md
+++ b/README.md
@@ -17,7 +17,7 @@
 ### 项目特点

 - 基于Go语言实现,支持多平台
- 使用字节旗下的[HertZ](https://github.com/cloudwego/hertz)作为Web框架
+- 使用[Gin](https://github.com/gin-gonic/gin)作为Web框架
 - 使用[Touka-HTTPC](https://github.com/satomitouka/touka-httpc)作为HTTP客户端
 - 支持Git clone,raw,realeases等文件拉取
 - 支持多个前端主题
@@ -34,7 +34,6 @@
 **本项目是[WJQSERVER-STUDIO/ghproxy-go](https://github.com/WJQSERVER-STUDIO/ghproxy-go)的重构版本,实现了原项目原定功能的同时,进一步优化了性能**
 关于此项目的详细开发过程,请参看Commit记录与[CHANGELOG.md](https://github.com/WJQSERVER-STUDIO/ghproxy/blob/main/CHANGELOG.md)

- v3.0.0 迁移到HertZ框架, 进一步提升效率, 同时v3.0.0与v2.4.0及以上版本兼容, 可直接平顺升级
 - v2.4.1 对路径匹配进行优化
 - v2.0.0 对`proxy`核心模块进行了重构,大幅优化内存占用
 - v1.0.0 迁移至本仓库,并再次重构内容实现
--- a/SECURITY.MD
+++ b/SECURITY.MD
@@ -6,9 +6,9 @@

 | 版本 | 是否支持 |
 | --- | --- |
-| v3.x.x | :white_check_mark: 当前最新版本序列 |
-| v2.x.x | :x: 这些版本已结束生命周期,不受支持 |
-| v1.x.x | :x: 这些版本已结束生命周期,不受支持 |
+| v3.x.x | :white_check_mark: 接受issue, 实验性 |
+| v2.x.x | :white_check_mark: 受支持, 正在维护 |
+| v1.x.x | :x: 这些版本已结束生命周期,不再受支持 |
 | 25w*a/b/c... | :warning: 此为PRE-RELEASE版本,用于开发与测试,可能存在未知的问题 |
 | 24w*a/b/c... | :warning: 此为PRE-RELEASE版本,用于开发与测试,可能存在未知的问题 生命周期已完全结束 |
 | v0.x.x | :x: 这些版本不再受支持 |
--- a/2
+++ b/2
@@ -1 +1 @@
-3.0.2
+2.6.2
--- a/api/api.go
+++ b/api/api.go
@@ -1,12 +1,16 @@
 package api

 import (
-	"context"
+	"encoding/json"
 	"ghproxy/config"

 	"github.com/WJQSERVER-STUDIO/go-utils/logger"
-	"github.com/cloudwego/hertz/pkg/app"
-	"github.com/cloudwego/hertz/pkg/app/server"
+	"github.com/gin-gonic/gin"
+)
+
+var (
+	router *gin.Engine
+	cfg    *config.Config
 )

 var (
@@ -18,120 +22,119 @@ var (
 	logError   = logger.LogError
 )

-func NoCacheMiddleware() app.HandlerFunc {
-	return func(ctx context.Context, c *app.RequestContext) {
+func NoCacheMiddleware() gin.HandlerFunc {
+	return func(c *gin.Context) {
 		// 设置禁止缓存的响应头
-		c.Response.Header.Set("Cache-Control", "no-store, no-cache, must-revalidate")
-		c.Response.Header.Set("Pragma", "no-cache")
-		c.Response.Header.Set("Expires", "0")
-		c.Next(ctx) // 继续处理请求
+		c.Header("Cache-Control", "no-store, no-cache, must-revalidate")
+		c.Header("Pragma", "no-cache")
+		c.Header("Expires", "0")
+		c.Next() // 继续处理请求
 	}
 }

-func InitHandleRouter(cfg *config.Config, r *server.Hertz, version string) {
-	apiRouter := r.Group("/api", NoCacheMiddleware())
+func InitHandleRouter(cfg *config.Config, router *gin.Engine, version string) {
+	apiRouter := router.Group("api", NoCacheMiddleware())
 	{
-		apiRouter.GET("/size_limit", func(ctx context.Context, c *app.RequestContext) {
-			SizeLimitHandler(cfg, c, ctx)
+		apiRouter.GET("/size_limit", func(c *gin.Context) {
+			SizeLimitHandler(cfg, c)
 		})
-		apiRouter.GET("/whitelist/status", func(ctx context.Context, c *app.RequestContext) {
-			WhiteListStatusHandler(cfg, c, ctx)
+		apiRouter.GET("/whitelist/status", func(c *gin.Context) {
+			WhiteListStatusHandler(c, cfg)
 		})
-		apiRouter.GET("/blacklist/status", func(ctx context.Context, c *app.RequestContext) {
-			BlackListStatusHandler(cfg, c, ctx)
+		apiRouter.GET("/blacklist/status", func(c *gin.Context) {
+			BlackListStatusHandler(c, cfg)
 		})
-		apiRouter.GET("/cors/status", func(ctx context.Context, c *app.RequestContext) {
-			CorsStatusHandler(cfg, c, ctx)
+		apiRouter.GET("/cors/status", func(c *gin.Context) {
+			CorsStatusHandler(c, cfg)
 		})
-		apiRouter.GET("/healthcheck", func(ctx context.Context, c *app.RequestContext) {
-			HealthcheckHandler(c, ctx)
+		apiRouter.GET("/healthcheck", func(c *gin.Context) {
+			HealthcheckHandler(c)
 		})
-		apiRouter.GET("/version", func(ctx context.Context, c *app.RequestContext) {
-			VersionHandler(c, ctx, version)
+		apiRouter.GET("/version", func(c *gin.Context) {
+			VersionHandler(c, version)
 		})
-		apiRouter.GET("/rate_limit/status", func(ctx context.Context, c *app.RequestContext) {
-			RateLimitStatusHandler(cfg, c, ctx)
+		apiRouter.GET("/rate_limit/status", func(c *gin.Context) {
+			RateLimitStatusHandler(c, cfg)
 		})
-		apiRouter.GET("/rate_limit/limit", func(ctx context.Context, c *app.RequestContext) {
-			RateLimitLimitHandler(cfg, c, ctx)
+		apiRouter.GET("/rate_limit/limit", func(c *gin.Context) {
+			RateLimitLimitHandler(c, cfg)
 		})
-		apiRouter.GET("/smartgit/status", func(ctx context.Context, c *app.RequestContext) {
-			SmartGitStatusHandler(cfg, c, ctx)
+		apiRouter.GET("/smartgit/status", func(c *gin.Context) {
+			SmartGitStatusHandler(c, cfg)
 		})
-
 	}
 	logInfo("API router Init success")
 }

-func SizeLimitHandler(cfg *config.Config, c *app.RequestContext, ctx context.Context) {
+func SizeLimitHandler(cfg *config.Config, c *gin.Context) {
 	sizeLimit := cfg.Server.SizeLimit
-	logInfo("%s %s %s %s %s", c.ClientIP(), c.Method(), string(c.Path()), c.Request.Header.UserAgent(), c.Request.Header.GetProtocol())
-	c.Response.Header.Set("Content-Type", "application/json")
-	c.JSON(200, (map[string]interface{}{
+	logInfo("%s %s %s %s %s", c.ClientIP(), c.Request.Method, c.Request.URL.Path, c.Request.UserAgent(), c.Request.Proto)
+	c.Writer.Header().Set("Content-Type", "application/json")
+	json.NewEncoder(c.Writer).Encode(map[string]interface{}{
 		"MaxResponseBodySize": sizeLimit,
-	}))
+	})
 }

-func WhiteListStatusHandler(cfg *config.Config, c *app.RequestContext, ctx context.Context) {
-	logInfo("%s %s %s %s %s", c.ClientIP(), c.Method(), string(c.Path()), c.Request.Header.UserAgent(), c.Request.Header.GetProtocol())
-	c.Response.Header.Set("Content-Type", "application/json")
-	c.JSON(200, (map[string]interface{}{
+func WhiteListStatusHandler(c *gin.Context, cfg *config.Config) {
+	logInfo("%s %s %s %s %s", c.ClientIP(), c.Request.Method, c.Request.URL.Path, c.Request.UserAgent(), c.Request.Proto)
+	c.Writer.Header().Set("Content-Type", "application/json")
+	json.NewEncoder(c.Writer).Encode(map[string]interface{}{
 		"Whitelist": cfg.Whitelist.Enabled,
-	}))
+	})
 }

-func BlackListStatusHandler(cfg *config.Config, c *app.RequestContext, ctx context.Context) {
-	logInfo("%s %s %s %s %s", c.ClientIP(), c.Method(), string(c.Path()), c.Request.Header.UserAgent(), c.Request.Header.GetProtocol())
-	c.Response.Header.Set("Content-Type", "application/json")
-	c.JSON(200, (map[string]interface{}{
+func BlackListStatusHandler(c *gin.Context, cfg *config.Config) {
+	logInfo("%s %s %s %s %s", c.ClientIP(), c.Request.Method, c.Request.URL.Path, c.Request.UserAgent(), c.Request.Proto)
+	c.Writer.Header().Set("Content-Type", "application/json")
+	json.NewEncoder(c.Writer).Encode(map[string]interface{}{
 		"Blacklist": cfg.Blacklist.Enabled,
-	}))
+	})
 }

-func CorsStatusHandler(cfg *config.Config, c *app.RequestContext, ctx context.Context) {
-	logInfo("%s %s %s %s %s", c.ClientIP(), c.Method(), string(c.Path()), c.Request.Header.UserAgent(), c.Request.Header.GetProtocol())
-	c.Response.Header.Set("Content-Type", "application/json")
-	c.JSON(200, (map[string]interface{}{
+func CorsStatusHandler(c *gin.Context, cfg *config.Config) {
+	logInfo("%s %s %s %s %s", c.ClientIP(), c.Request.Method, c.Request.URL.Path, c.Request.UserAgent(), c.Request.Proto)
+	c.Writer.Header().Set("Content-Type", "application/json")
+	json.NewEncoder(c.Writer).Encode(map[string]interface{}{
 		"Cors": cfg.Server.Cors,
-	}))
+	})
 }

-func HealthcheckHandler(c *app.RequestContext, ctx context.Context) {
-	logInfo("%s %s %s %s %s", c.ClientIP(), c.Method(), string(c.Path()), c.Request.Header.UserAgent(), c.Request.Header.GetProtocol())
-	c.Response.Header.Set("Content-Type", "application/json")
-	c.JSON(200, (map[string]interface{}{
+func HealthcheckHandler(c *gin.Context) {
+	logInfo("%s %s %s %s %s", c.ClientIP(), c.Request.Method, c.Request.URL.Path, c.Request.UserAgent(), c.Request.Proto)
+	c.Writer.Header().Set("Content-Type", "application/json")
+	json.NewEncoder(c.Writer).Encode(map[string]interface{}{
 		"Status": "OK",
-	}))
+	})
 }

-func VersionHandler(c *app.RequestContext, ctx context.Context, version string) {
-	logInfo("%s %s %s %s %s", c.ClientIP(), c.Method(), string(c.Path()), c.Request.Header.UserAgent(), c.Request.Header.GetProtocol())
-	c.Response.Header.Set("Content-Type", "application/json")
-	c.JSON(200, (map[string]interface{}{
+func VersionHandler(c *gin.Context, version string) {
+	logInfo("%s %s %s %s %s", c.ClientIP(), c.Request.Method, c.Request.URL.Path, c.Request.UserAgent(), c.Request.Proto)
+	c.Writer.Header().Set("Content-Type", "application/json")
+	json.NewEncoder(c.Writer).Encode(map[string]interface{}{
 		"Version": version,
-	}))
+	})
 }

-func RateLimitStatusHandler(cfg *config.Config, c *app.RequestContext, ctx context.Context) {
-	logInfo("%s %s %s %s %s", c.ClientIP(), c.Method(), string(c.Path()), c.Request.Header.UserAgent(), c.Request.Header.GetProtocol())
-	c.Response.Header.Set("Content-Type", "application/json")
-	c.JSON(200, (map[string]interface{}{
+func RateLimitStatusHandler(c *gin.Context, cfg *config.Config) {
+	logInfo("%s %s %s %s %s", c.ClientIP(), c.Request.Method, c.Request.URL.Path, c.Request.UserAgent(), c.Request.Proto)
+	c.Writer.Header().Set("Content-Type", "application/json")
+	json.NewEncoder(c.Writer).Encode(map[string]interface{}{
 		"RateLimit": cfg.RateLimit.Enabled,
-	}))
+	})
 }

-func RateLimitLimitHandler(cfg *config.Config, c *app.RequestContext, ctx context.Context) {
-	logInfo("%s %s %s %s %s", c.ClientIP(), c.Method(), string(c.Path()), c.Request.Header.UserAgent(), c.Request.Header.GetProtocol())
-	c.Response.Header.Set("Content-Type", "application/json")
-	c.JSON(200, (map[string]interface{}{
+func RateLimitLimitHandler(c *gin.Context, cfg *config.Config) {
+	logInfo("%s %s %s %s %s", c.ClientIP(), c.Request.Method, c.Request.URL.Path, c.Request.UserAgent(), c.Request.Proto)
+	c.Writer.Header().Set("Content-Type", "application/json")
+	json.NewEncoder(c.Writer).Encode(map[string]interface{}{
 		"RatePerMinute": cfg.RateLimit.RatePerMinute,
-	}))
+	})
 }

-func SmartGitStatusHandler(cfg *config.Config, c *app.RequestContext, ctx context.Context) {
-	logInfo("%s %s %s %s %s", c.ClientIP(), c.Method(), string(c.Path()), c.Request.Header.UserAgent(), c.Request.Header.GetProtocol())
-	c.Response.Header.Set("Content-Type", "application/json")
-	c.JSON(200, (map[string]interface{}{
+func SmartGitStatusHandler(c *gin.Context, cfg *config.Config) {
+	logInfo("%s %s %s %s %s", c.ClientIP(), c.Request.Method, c.Request.URL.Path, c.Request.UserAgent(), c.Request.Proto)
+	c.Writer.Header().Set("Content-Type", "application/json")
+	json.NewEncoder(c.Writer).Encode(map[string]interface{}{
 		"enabled": cfg.GitClone.Mode == "cache",
-	}))
+	})
 }
--- a/auth/auth-header.go
+++ b/auth/auth-header.go
@@ -4,16 +4,16 @@ import (
 	"fmt"
 	"ghproxy/config"

-	"github.com/cloudwego/hertz/pkg/app"
+	"github.com/gin-gonic/gin"
 )

-func AuthHeaderHandler(c *app.RequestContext, cfg *config.Config) (isValid bool, err error) {
+func AuthHeaderHandler(c *gin.Context, cfg *config.Config) (isValid bool, err error) {
 	if !cfg.Auth.Enabled {
 		return true, nil
 	}
 	// 获取"GH-Auth"的值
-	authToken := string(c.GetHeader("GH-Auth"))
-	logDebug("%s %s %s %s %s AUTH_TOKEN: %s", c.Method(), string(c.Path()), c.Request.Header.UserAgent(), c.Request.Header.GetProtocol(), authToken)
+	authToken := c.GetHeader("GH-Auth")
+	logDebug("%s %s %s %s %s AUTH_TOKEN: %s", c.Request.Method, c.Request.Host, c.Request.URL.Path, c.Request.Proto, c.Request.RemoteAddr, authToken)
 	if authToken == "" {
 		return false, fmt.Errorf("Auth token not found")
 	}
--- a/auth/auth-parameters.go
+++ b/auth/auth-parameters.go
@@ -4,16 +4,16 @@ import (
 	"fmt"
 	"ghproxy/config"

-	"github.com/cloudwego/hertz/pkg/app"
+	"github.com/gin-gonic/gin"
 )

-func AuthParametersHandler(c *app.RequestContext, cfg *config.Config) (isValid bool, err error) {
+func AuthParametersHandler(c *gin.Context, cfg *config.Config) (isValid bool, err error) {
 	if !cfg.Auth.Enabled {
 		return true, nil
 	}

 	authToken := c.Query("auth_token")
-	logDebug("%s %s %s %s %s AUTH_TOKEN: %s", c.ClientIP(), c.Method(), string(c.Path()), c.Request.Header.UserAgent(), c.Request.Header.GetProtocol(), authToken)
+	logDebug("%s %s %s %s %s AUTH_TOKEN: %s", c.ClientIP(), c.Request.Method, c.Request.URL.Path, c.Request.UserAgent(), c.Request.Proto, authToken)

 	if authToken == "" {
 		return false, fmt.Errorf("Auth token not found")
--- a/auth/auth.go
+++ b/auth/auth.go
@@ -1,12 +1,11 @@
 package auth

 import (
-	"context"
 	"fmt"
 	"ghproxy/config"

 	"github.com/WJQSERVER-STUDIO/go-utils/logger"
-	"github.com/cloudwego/hertz/pkg/app"
+	"github.com/gin-gonic/gin"
 )

 var (
@@ -36,7 +35,7 @@ func Init(cfg *config.Config) {
 	logDebug("Auth Init")
 }

-func AuthHandler(ctx context.Context, c *app.RequestContext, cfg *config.Config) (isValid bool, err error) {
+func AuthHandler(c *gin.Context, cfg *config.Config) (isValid bool, err error) {
 	if cfg.Auth.AuthMethod == "parameters" {
 		isValid, err = AuthParametersHandler(c, cfg)
 		return isValid, err
--- a/config/config.go
+++ b/config/config.go
@@ -64,15 +64,17 @@ type GitCloneConfig struct {
 /*
 [shell]
 editor = true
+rewriteAPI = false
 */
 type ShellConfig struct {
-	Editor bool `toml:"editor"`
+	Editor     bool `toml:"editor"`
+	RewriteAPI bool `toml:"rewriteAPI"`
 }

 /*
 [pages]
 mode = "internal" # "internal" or "external"
-theme = "bootstrap" # "bootstrap" or "nebula" or "design" or "classic"
+theme = "bootstrap" # "bootstrap" or "nebula"
 staticDir = "/data/www"
 */
 type PagesConfig struct {
--- a/config/config.toml
+++ b/config/config.toml
@@ -19,6 +19,7 @@ ForceH2C = false

 [shell]
 editor = false
+rewriteAPI = false

 [pages]
 mode = "internal" # "internal" or "external"
--- a/go.mod
+++ b/go.mod
@@ -6,33 +6,41 @@ require (
 	github.com/BurntSushi/toml v1.5.0
 	github.com/WJQSERVER-STUDIO/go-utils/copyb v0.0.4
 	github.com/WJQSERVER-STUDIO/go-utils/logger v1.5.0
-	github.com/cloudwego/hertz v0.9.6
-	github.com/hertz-contrib/http2 v0.1.8
+	github.com/gin-gonic/gin v1.10.0
 	github.com/satomitouka/touka-httpc v0.3.3
-	github.com/valyala/bytebufferpool v1.0.0
-	golang.org/x/net v0.37.0
+	golang.org/x/net v0.38.0
 	golang.org/x/time v0.11.0
 )

 require (
 	github.com/WJQSERVER-STUDIO/go-utils/log v0.0.1 // indirect
-	github.com/bytedance/gopkg v0.1.1 // indirect
 	github.com/bytedance/sonic v1.13.2 // indirect
 	github.com/bytedance/sonic/loader v0.2.4 // indirect
 	github.com/cloudwego/base64x v0.1.5 // indirect
-	github.com/cloudwego/netpoll v0.6.5 // indirect
-	github.com/fsnotify/fsnotify v1.8.0 // indirect
+	github.com/gabriel-vasile/mimetype v1.4.8 // indirect
+	github.com/gin-contrib/sse v1.0.0 // indirect
+	github.com/go-playground/locales v0.14.1 // indirect
+	github.com/go-playground/universal-translator v0.18.1 // indirect
+	github.com/go-playground/validator/v10 v10.26.0 // indirect
+	github.com/goccy/go-json v0.10.5 // indirect
 	github.com/google/go-cmp v0.7.0 // indirect
+	github.com/json-iterator/go v1.1.12 // indirect
 	github.com/klauspost/cpuid/v2 v2.2.10 // indirect
-	github.com/nyaruka/phonenumbers v1.6.0 // indirect
-	github.com/stretchr/objx v0.5.2 // indirect
-	github.com/tidwall/gjson v1.18.0 // indirect
-	github.com/tidwall/match v1.1.1 // indirect
-	github.com/tidwall/pretty v1.2.1 // indirect
+	github.com/kr/pretty v0.3.1 // indirect
+	github.com/leodido/go-urn v1.4.0 // indirect
+	github.com/mattn/go-isatty v0.0.20 // indirect
+	github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
+	github.com/modern-go/reflect2 v1.0.2 // indirect
+	github.com/pelletier/go-toml/v2 v2.2.3 // indirect
+	github.com/rogpeppe/go-internal v1.14.1 // indirect
 	github.com/twitchyliquid64/golang-asm v0.15.1 // indirect
+	github.com/ugorji/go/codec v1.2.12 // indirect
+	github.com/valyala/bytebufferpool v1.0.0 // indirect
 	golang.org/x/arch v0.15.0 // indirect
-	golang.org/x/exp v0.0.0-20250305212735-054e65f0b394 // indirect
+	golang.org/x/crypto v0.36.0 // indirect
 	golang.org/x/sys v0.31.0 // indirect
 	golang.org/x/text v0.23.0 // indirect
-	google.golang.org/protobuf v1.36.5 // indirect
+	google.golang.org/protobuf v1.36.6 // indirect
+	gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c // indirect
+	gopkg.in/yaml.v3 v3.0.1 // indirect
 )
--- a/go.sum
+++ b/go.sum
@@ -6,11 +6,6 @@ github.com/WJQSERVER-STUDIO/go-utils/log v0.0.1 h1:gJEQspQPB527Vp2FPcdOrynQEj3YY
 github.com/WJQSERVER-STUDIO/go-utils/log v0.0.1/go.mod h1:j9Q+xnwpOfve7/uJnZ2izRQw6NNoXjvJHz7vUQAaLZE=
 github.com/WJQSERVER-STUDIO/go-utils/logger v1.5.0 h1:Uk4N7Sh4OPth3am3xVv17JlAm7tsna97ZLQRpQj7r5c=
 github.com/WJQSERVER-STUDIO/go-utils/logger v1.5.0/go.mod h1:mtxlnDdwsHcqDDpAQLa94nxbPFwNHSAHbBbIXQAA3po=
-github.com/bytedance/gopkg v0.1.0/go.mod h1:FtQG3YbQG9L/91pbKSw787yBQPutC+457AvDW77fgUQ=
-github.com/bytedance/gopkg v0.1.1 h1:3azzgSkiaw79u24a+w9arfH8OfnQQ4MHUt9lJFREEaE=
-github.com/bytedance/gopkg v0.1.1/go.mod h1:576VvJ+eJgyCzdjS+c4+77QF3p7ubbtiKARP3TxducM=
-github.com/bytedance/mockey v1.2.12 h1:aeszOmGw8CPX8CRx1DZ/Glzb1yXvhjDh6jdFBNZjsU4=
-github.com/bytedance/mockey v1.2.12/go.mod h1:3ZA4MQasmqC87Tw0w7Ygdy7eHIc2xgpZ8Pona5rsYIk=
 github.com/bytedance/sonic v1.13.2 h1:8/H1FempDZqC4VqjptGo14QQlJx8VdZJegxs6wwfqpQ=
 github.com/bytedance/sonic v1.13.2/go.mod h1:o68xyaF9u2gvVBuGHPlUVCy+ZfmNNO5ETf1+KgkJhz4=
 github.com/bytedance/sonic/loader v0.1.1/go.mod h1:ncP89zfokxS5LZrJxl5z0UJcsk4M4yY2JpfqGeCtNLU=
@@ -18,82 +13,98 @@ github.com/bytedance/sonic/loader v0.2.4 h1:ZWCw4stuXUsn1/+zQDqeE7JKP+QO47tz7QCN
 github.com/bytedance/sonic/loader v0.2.4/go.mod h1:N8A3vUdtUebEY2/VQC0MyhYeKUFosQU6FxH2JmUe6VI=
 github.com/cloudwego/base64x v0.1.5 h1:XPciSp1xaq2VCSt6lF0phncD4koWyULpl5bUxbfCyP4=
 github.com/cloudwego/base64x v0.1.5/go.mod h1:0zlkT4Wn5C6NdauXdJRhSKRlJvmclQ1hhJgA0rcu/8w=
-github.com/cloudwego/hertz v0.9.6 h1:Kj5SSPlKBC32NIN7+B/tt8O1pdDz8brMai00rqqjULQ=
-github.com/cloudwego/hertz v0.9.6/go.mod h1:X5Ez52XhtszU4t+CTBGIJI4PqmcI1oSf8ULBz0SWfLo=
 github.com/cloudwego/iasm v0.2.0/go.mod h1:8rXZaNYT2n95jn+zTI1sDr+IgcD2GVs0nlbbQPiEFhY=
-github.com/cloudwego/netpoll v0.6.5 h1:6E/BWhSzQoyLg9Kx/4xiMdIIpovzwBtXvuqSqaTUzDQ=
-github.com/cloudwego/netpoll v0.6.5/go.mod h1:BtM+GjKTdwKoC8IOzD08/+8eEn2gYoiNLipFca6BVXQ=
+github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E=
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
-github.com/fsnotify/fsnotify v1.8.0 h1:dAwr6QBTBZIkG8roQaJjGof0pp0EeF+tNV7YBP3F/8M=
-github.com/fsnotify/fsnotify v1.8.0/go.mod h1:8jBTzvmWwFyi3Pb8djgCCO5IBqzKJ/Jwo8TRcHyHii0=
+github.com/gabriel-vasile/mimetype v1.4.8 h1:FfZ3gj38NjllZIeJAmMhr+qKL8Wu+nOoI3GqacKw1NM=
+github.com/gabriel-vasile/mimetype v1.4.8/go.mod h1:ByKUIKGjh1ODkGM1asKUbQZOLGrPjydw3hYPU2YU9t8=
+github.com/gin-contrib/sse v1.0.0 h1:y3bT1mUWUxDpW4JLQg/HnTqV4rozuW4tC9eFKTxYI9E=
+github.com/gin-contrib/sse v1.0.0/go.mod h1:zNuFdwarAygJBht0NTKiSi3jRf6RbqeILZ9Sp6Slhe0=
+github.com/gin-gonic/gin v1.10.0 h1:nTuyha1TYqgedzytsKYqna+DfLos46nTv2ygFy86HFU=
+github.com/gin-gonic/gin v1.10.0/go.mod h1:4PMNQiOhvDRa013RKVbsiNwoyezlm2rm0uX/T7kzp5Y=
+github.com/go-playground/assert/v2 v2.2.0 h1:JvknZsQTYeFEAhQwI4qEt9cyV5ONwRHC+lYKSsYSR8s=
+github.com/go-playground/assert/v2 v2.2.0/go.mod h1:VDjEfimB/XKnb+ZQfWdccd7VUvScMdVu0Titje2rxJ4=
+github.com/go-playground/locales v0.14.1 h1:EWaQ/wswjilfKLTECiXz7Rh+3BjFhfDFKv/oXslEjJA=
+github.com/go-playground/locales v0.14.1/go.mod h1:hxrqLVvrK65+Rwrd5Fc6F2O76J/NuW9t0sjnWqG1slY=
+github.com/go-playground/universal-translator v0.18.1 h1:Bcnm0ZwsGyWbCzImXv+pAJnYK9S473LQFuzCbDbfSFY=
+github.com/go-playground/universal-translator v0.18.1/go.mod h1:xekY+UJKNuX9WP91TpwSH2VMlDf28Uj24BCp08ZFTUY=
+github.com/go-playground/validator/v10 v10.26.0 h1:SP05Nqhjcvz81uJaRfEV0YBSSSGMc/iMaVtFbr3Sw2k=
+github.com/go-playground/validator/v10 v10.26.0/go.mod h1:I5QpIEbmr8On7W0TktmJAumgzX4CA1XNl4ZmDuVHKKo=
+github.com/goccy/go-json v0.10.5 h1:Fq85nIqj+gXn/S5ahsiTlK3TmC85qgirsdTP/+DeaC4=
+github.com/goccy/go-json v0.10.5/go.mod h1:oq7eo15ShAhp70Anwd5lgX2pLfOS3QCiwU/PULtXL6M=
 github.com/google/go-cmp v0.7.0 h1:wk8382ETsv4JYUZwIsn6YpYiWiBsYLSJiTsyBybVuN8=
 github.com/google/go-cmp v0.7.0/go.mod h1:pXiqmnSA92OHEEa9HXL2W4E7lf9JzCmGVUdgjX3N/iU=
-github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1 h1:EGx4pi6eqNxGaHF6qqu48+N2wcFQ5qg5FXgOdqsJ5d8=
-github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1/go.mod h1:wJfORRmW1u3UXTncJ5qlYoELFm8eSnnEO6hX4iZ3EWY=
-github.com/hertz-contrib/http2 v0.1.8 h1:kjfCGkUxJZHgfPsnRjx1FLJBG55KvtvSQD214guBQLw=
-github.com/hertz-contrib/http2 v0.1.8/go.mod h1:m42hrl8fiTwE4p8c7JdRUZpkePEthvV89q3elL2GeD0=
-github.com/jtolds/gls v4.20.0+incompatible h1:xdiiI2gbIgH/gLH7ADydsJ1uDOEzR8yvV7C0MuV77Wo=
-github.com/jtolds/gls v4.20.0+incompatible/go.mod h1:QJZ7F/aHp+rZTRtaJ1ow/lLfFfVYBRgL+9YlvaHOwJU=
+github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
+github.com/json-iterator/go v1.1.12 h1:PV8peI4a0ysnczrg+LtxykD8LfKY9ML6u2jnxaEnrnM=
+github.com/json-iterator/go v1.1.12/go.mod h1:e30LSqwooZae/UwlEbR2852Gd8hjQvJoHmT4TnhNGBo=
 github.com/klauspost/cpuid/v2 v2.0.9/go.mod h1:FInQzS24/EEf25PyTYn52gqo7WaD8xa0213Md/qVLRg=
 github.com/klauspost/cpuid/v2 v2.2.10 h1:tBs3QSyvjDyFTq3uoc/9xFpCuOsJQFNPiAhYdw2skhE=
 github.com/klauspost/cpuid/v2 v2.2.10/go.mod h1:hqwkgyIinND0mEev00jJYCxPNVRVXFQeu1XKlok6oO0=
 github.com/knz/go-libedit v1.10.1/go.mod h1:MZTVkCWyz0oBc7JOWP3wNAzd002ZbM/5hgShxwh4x8M=
-github.com/nyaruka/phonenumbers v1.6.0 h1:r9ax45fFg+YLUs2X4bNXm5RAxWl00hYjFgNlv32vtHk=
-github.com/nyaruka/phonenumbers v1.6.0/go.mod h1:7gjs+Lchqm49adhAKB5cdcng5ZXgt6x7Jgvi0ZorUtU=
+github.com/kr/pretty v0.2.1/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI=
+github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE=
+github.com/kr/pretty v0.3.1/go.mod h1:hoEshYVHaxMs3cyo3Yncou5ZscifuDolrwPKZanG3xk=
+github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
+github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
+github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
+github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
+github.com/leodido/go-urn v1.4.0 h1:WT9HwE9SGECu3lg4d/dIA+jxlljEa1/ffXKmRjqdmIQ=
+github.com/leodido/go-urn v1.4.0/go.mod h1:bvxc+MVxLKB4z00jd1z+Dvzr47oO32F/QSNjSBOlFxI=
+github.com/mattn/go-isatty v0.0.20 h1:xfD0iDuEKnDkl03q4limB+vH+GxLEtL/jb4xVJSWWEY=
+github.com/mattn/go-isatty v0.0.20/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y=
+github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
+github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd h1:TRLaZ9cD/w8PVh93nsPXa1VrQ6jlwL5oN8l14QlcNfg=
+github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
+github.com/modern-go/reflect2 v1.0.2 h1:xBagoLtFs94CBntxluKeaWgTMpvLxC4ur3nMaC9Gz0M=
+github.com/modern-go/reflect2 v1.0.2/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjYzDa0/r8luk=
+github.com/pelletier/go-toml/v2 v2.2.3 h1:YmeHyLY8mFWbdkNWwpr+qIL2bEqT0o95WSdkNHvL12M=
+github.com/pelletier/go-toml/v2 v2.2.3/go.mod h1:MfCQTFTvCcUyyvvwm1+G6H/jORL20Xlb6rzQu9GuUkc=
+github.com/pkg/diff v0.0.0-20210226163009-20ebb0f2a09e/go.mod h1:pJLUxLENpZxwdsKMEsNbx1VGcRFpLqf3715MtcvvzbA=
 github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
+github.com/rogpeppe/go-internal v1.9.0/go.mod h1:WtVeX8xhTBvf0smdhujwtBcq4Qrzq/fJaraNFVN+nFs=
+github.com/rogpeppe/go-internal v1.14.1 h1:UQB4HGPB6osV0SQTLymcB4TgvyWu6ZyliaW0tI/otEQ=
+github.com/rogpeppe/go-internal v1.14.1/go.mod h1:MaRKkUm5W0goXpeCfT7UZI6fk/L7L7so1lCWt35ZSgc=
 github.com/satomitouka/touka-httpc v0.3.3 h1:Th0uJ5do3oqqZgdUDtqD1SH11x8TcJmrwHMJQlEIKCg=
 github.com/satomitouka/touka-httpc v0.3.3/go.mod h1:sNXyW5XBufkwB9ZJ+PIlgN/6xiJ7aZV1fWGrXR0u3bA=
-github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d h1:zE9ykElWQ6/NYmHa3jpm/yHnI4xSofP+UP6SpjHcSeM=
-github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d/go.mod h1:OnSkiWE9lh6wB0YB77sQom3nweQdgAjqCqsofrRNTgc=
-github.com/smartystreets/goconvey v1.6.4 h1:fv0U8FUIMPNf1L9lnHLvLhgicrIVChEkdzIKYqbNC9s=
-github.com/smartystreets/goconvey v1.6.4/go.mod h1:syvi0/a8iFYH4r/RixwvyeAJjdLS9QV7WQ/tjFTllLA=
 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
 github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw=
 github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpEOglKo=
-github.com/stretchr/objx v0.5.2 h1:xuMeJ0Sdp5ZMRXx/aWO6RZxdr3beISkG5/G/aIRr3pY=
 github.com/stretchr/objx v0.5.2/go.mod h1:FRsXN1f5AsAjCGJKqEizvkpNtU+EGNCLh3NxZ/8L+MA=
+github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
 github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
 github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
 github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU=
 github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4=
+github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo=
 github.com/stretchr/testify v1.10.0 h1:Xv5erBjTwe/5IxqUQTdXv5kgmIvbHo3QQyRwhJsOfJA=
 github.com/stretchr/testify v1.10.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
-github.com/tidwall/gjson v1.18.0 h1:FIDeeyB800efLX89e5a8Y0BNH+LOngJyGrIWxG2FKQY=
-github.com/tidwall/gjson v1.18.0/go.mod h1:/wbyibRr2FHMks5tjHJ5F8dMZh3AcwJEMf5vlfC0lxk=
-github.com/tidwall/match v1.1.1 h1:+Ho715JplO36QYgwN9PGYNhgZvoUSc9X2c80KVTi+GA=
-github.com/tidwall/match v1.1.1/go.mod h1:eRSPERbgtNPcGhD8UCthc6PmLEQXEWd3PRB5JTxsfmM=
-github.com/tidwall/pretty v1.2.0/go.mod h1:ITEVvHYasfjBbM0u2Pg8T2nJnzm8xPwvNhhsoaGGjNU=
-github.com/tidwall/pretty v1.2.1 h1:qjsOFOWWQl+N3RsoF5/ssm1pHmJJwhjlSbZ51I6wMl4=
-github.com/tidwall/pretty v1.2.1/go.mod h1:ITEVvHYasfjBbM0u2Pg8T2nJnzm8xPwvNhhsoaGGjNU=
 github.com/twitchyliquid64/golang-asm v0.15.1 h1:SU5vSMR7hnwNxj24w34ZyCi/FmDZTkS4MhqMhdFk5YI=
 github.com/twitchyliquid64/golang-asm v0.15.1/go.mod h1:a1lVb/DtPvCB8fslRZhAngC2+aY1QWCk3Cedj/Gdt08=
+github.com/ugorji/go/codec v1.2.12 h1:9LC83zGrHhuUA9l16C9AHXAqEV/2wBQ4nkvumAE65EE=
+github.com/ugorji/go/codec v1.2.12/go.mod h1:UNopzCgEMSXjBc6AOMqYvWC1ktqTAfzJZUZgYf6w6lg=
 github.com/valyala/bytebufferpool v1.0.0 h1:GqA5TC/0021Y/b9FG4Oi9Mr3q7XYx6KllzawFIhcdPw=
 github.com/valyala/bytebufferpool v1.0.0/go.mod h1:6bBcMArwyJ5K/AmCkWv1jt77kVWyCJ6HpOuEn7z0Csc=
 golang.org/x/arch v0.15.0 h1:QtOrQd0bTUnhNVNndMpLHNWrDmYzZ2KDqSrEymqInZw=
 golang.org/x/arch v0.15.0/go.mod h1:JmwW7aLIoRUKgaTzhkiEFxvcEiQGyOg9BMonBJUS7EE=
-golang.org/x/exp v0.0.0-20250305212735-054e65f0b394 h1:nDVHiLt8aIbd/VzvPWN6kSOPE7+F/fNFDSXLVYkE/Iw=
-golang.org/x/exp v0.0.0-20250305212735-054e65f0b394/go.mod h1:sIifuuw/Yco/y6yb6+bDNfyeQ/MdPUy/hKEMYQV17cM=
-golang.org/x/net v0.0.0-20221014081412-f15817d10f9b/go.mod h1:YDH+HFinaLZZlnHAfSS6ZXJJ9M9t4Dl22yv3iI2vPwk=
-golang.org/x/net v0.37.0 h1:1zLorHbz+LYj7MQlSf1+2tPIIgibq2eL5xkrGk6f+2c=
-golang.org/x/net v0.37.0/go.mod h1:ivrbrMbzFq5J41QOQh0siUuly180yBYtLp+CKbEaFx8=
-golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20220728004956-3c1f35247d10/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/crypto v0.36.0 h1:AnAEvhDddvBdpY+uR+MyHmuZzzNqXSe/GvuDeob5L34=
+golang.org/x/crypto v0.36.0/go.mod h1:Y4J0ReaxCR1IMaabaSMugxJES1EpwhBHhv2bDHklZvc=
+golang.org/x/net v0.38.0 h1:vRMAPTMaeGqVhG5QyLJHqNDwecKTomGeqbnfZyKlBI8=
+golang.org/x/net v0.38.0/go.mod h1:ivrbrMbzFq5J41QOQh0siUuly180yBYtLp+CKbEaFx8=
+golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.31.0 h1:ioabZlmFYtWhL+TRYpcnNlLwhyxaM9kWTDEmfnprqik=
 golang.org/x/sys v0.31.0/go.mod h1:BJP2sWEmIv4KK5OTEluFJCKSidICx8ciO85XgH3Ak8k=
-golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
-golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
 golang.org/x/text v0.23.0 h1:D71I7dUrlY+VX0gQShAThNGHFxZ13dGLBHQLVl1mJlY=
 golang.org/x/text v0.23.0/go.mod h1:/BLNzu4aZCJ1+kcD0DNRotWKage4q2rGVAg4o22unh4=
 golang.org/x/time v0.11.0 h1:/bpjEDfN9tkoN/ryeYHnv5hcMlc8ncjMcM4XBk5NWV0=
 golang.org/x/time v0.11.0/go.mod h1:CDIdPxbZBQxdj6cxyCIdrNogrJKMJ7pr37NYpMcMDSg=
-golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
-google.golang.org/protobuf v1.36.5 h1:tPhr+woSbjfYvY6/GPufUoYizxw1cF/yFoxJ2fmpwlM=
-google.golang.org/protobuf v1.36.5/go.mod h1:9fA7Ob0pmnwhb644+1+CVWFRbNajQ6iRojtC/QF5bRE=
+google.golang.org/protobuf v1.36.6 h1:z1NpPI8ku2WgiWnf+t9wTPsn6eP1L7ksHUlkfLvd9xY=
+google.golang.org/protobuf v1.36.6/go.mod h1:jduwjTPXsFjZGTmRluh+L6NjiWu7pchiJ2/5YcXBHnY=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
+gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk=
+gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q=
 gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
 gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
 gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
--- a/loggin/loggin.go
+++ b/loggin/loggin.go
@@ -0,0 +1,34 @@
+package loggin
+
+import (
+	"ghproxy/timing"
+	"time"
+
+	"github.com/WJQSERVER-STUDIO/go-utils/logger"
+	"github.com/gin-gonic/gin"
+)
+
+var (
+	logw       = logger.Logw
+	LogDump    = logger.LogDump
+	logDebug   = logger.LogDebug
+	logInfo    = logger.LogInfo
+	logWarning = logger.LogWarning
+	logError   = logger.LogError
+)
+
+// 日志中间件
+func Middleware() gin.HandlerFunc {
+	return func(c *gin.Context) {
+		// 处理请求
+		c.Next()
+
+		var timingResults time.Duration
+
+		// 获取计时结果
+		timingResults, _ = timing.Get(c)
+
+		// 记录日志 IP METHOD URL USERAGENT PROTOCOL STATUS TIMING
+		logInfo("%s %s %s %s %d %s ", c.ClientIP(), c.Request.Method, c.Request.URL.Path, c.Request.UserAgent(), c.Writer.Status(), timingResults)
+	}
+}
--- a/main.go
+++ b/main.go
@@ -5,52 +5,44 @@ import (
 	"embed"
 	"flag"
 	"fmt"
+	"io"
 	"io/fs"
 	"net/http"
 	"os"
+	"os/signal"
+	"syscall"
 	"time"

 	"ghproxy/api"
 	"ghproxy/auth"
 	"ghproxy/config"
 	"ghproxy/middleware/loggin"
+	"ghproxy/middleware/timing"
 	"ghproxy/proxy"
 	"ghproxy/rate"

 	"github.com/WJQSERVER-STUDIO/go-utils/logger"

-	"github.com/cloudwego/hertz/pkg/app"
-	"github.com/cloudwego/hertz/pkg/app/middlewares/server/recovery"
-	"github.com/cloudwego/hertz/pkg/app/server"
-	"github.com/cloudwego/hertz/pkg/common/adaptor"
-
-	"github.com/hertz-contrib/http2/factory"
+	"github.com/gin-gonic/gin"
 )

 var (
 	cfg         *config.Config
-	r           *server.Hertz
+	router      *gin.Engine
 	configfile  = "/data/ghproxy/config/config.toml"
 	cfgfile     string
 	version     string
+	dev         string
 	runMode     string
 	limiter     *rate.RateLimiter
 	iplimiter   *rate.IPRateLimiter
-	showVersion bool // 新增的版本号标志
-	showHelp    bool // 新增的帮助标志
+	showVersion bool
+	showHelp    bool
 )

 var (
 	//go:embed pages/*
 	pagesFS embed.FS
-	/*
-		//go:embed pages/bootstrap/*
-		BootstrapPagesFS embed.FS
-		//go:embed pages/nebula/*
-		NebulaPagesFS embed.FS
-		//go:embed pages/design/*
-		DesignPagesFS embed.FS
-	*/
 )

 var (
@@ -118,12 +110,10 @@ func setupLogger(cfg *config.Config) {
 	err = logger.Init(cfg.Log.LogFilePath, cfg.Log.MaxLogSize)
 	if err != nil {
 		fmt.Printf("Failed to initialize logger: %v\n", err)
-		os.Exit(1)
 	}
 	err = logger.SetLogLevel(cfg.Log.Level)
 	if err != nil {
 		fmt.Printf("Logger Level Error: %v\n", err)
-		os.Exit(1)
 	}
 	fmt.Printf("Log Level: %s\n", cfg.Log.Level)
 	logDebug("Config File Path: ", cfgfile)
@@ -135,8 +125,8 @@ func loadlist(cfg *config.Config) {
 	auth.Init(cfg)
 }

-func setupApi(cfg *config.Config, r *server.Hertz, version string) {
-	api.InitHandleRouter(cfg, r, version)
+func setupApi(cfg *config.Config, router *gin.Engine, version string) {
+	api.InitHandleRouter(cfg, router, version)
 }

 func setupRateLimit(cfg *config.Config) {
@@ -156,7 +146,7 @@ func InitReq(cfg *config.Config) {
 }

 // loadEmbeddedPages 加载嵌入式页面资源
-func loadEmbeddedPages(cfg *config.Config) (fs.FS, error) {
+func loadEmbeddedPages(cfg *config.Config) (fs.FS, fs.FS, error) {
 	var pages fs.FS
 	var err error
 	switch cfg.Pages.Theme {
@@ -178,59 +168,35 @@ func loadEmbeddedPages(cfg *config.Config) (fs.FS, error) {
 	}

 	if err != nil {
-		return nil, fmt.Errorf("failed to load embedded pages: %w", err)
+		return nil, nil, fmt.Errorf("failed to load embedded pages: %w", err)
 	}
-	return pages, nil
+
+	var assets fs.FS
+	assets, err = fs.Sub(pagesFS, "pages/assets")
+	if err != nil {
+		return nil, nil, fmt.Errorf("failed to load embedded assets: %w", err)
+	}
+	return pages, assets, nil
 }

 // setupPages 设置页面路由
-func setupPages(cfg *config.Config, r *server.Hertz) {
+func setupPages(cfg *config.Config, router *gin.Engine) {
 	switch cfg.Pages.Mode {
 	case "internal":
 		// 加载嵌入式资源
-		pages, err := loadEmbeddedPages(cfg)
+		pages, assets, err := loadEmbeddedPages(cfg)
 		if err != nil {
 			logError("Failed when processing internal pages: %s", err)
 			return
 		}

 		// 设置嵌入式资源路由
-		r.GET("/", func(ctx context.Context, c *app.RequestContext) {
-			staticServer := http.FileServer(http.FS(pages))
-			req, err := adaptor.GetCompatRequest(&c.Request)
-			if err != nil {
-				logError("%s", err)
-				return
-			}
-			staticServer.ServeHTTP(adaptor.GetCompatResponseWriter(&c.Response), req)
-		})
-		r.GET("/favicon.ico", func(ctx context.Context, c *app.RequestContext) {
-			staticServer := http.FileServer(http.FS(pages))
-			req, err := adaptor.GetCompatRequest(&c.Request)
-			if err != nil {
-				logError("%s", err)
-				return
-			}
-			staticServer.ServeHTTP(adaptor.GetCompatResponseWriter(&c.Response), req)
-		})
-		r.GET("/script.js", func(ctx context.Context, c *app.RequestContext) {
-			staticServer := http.FileServer(http.FS(pages))
-			req, err := adaptor.GetCompatRequest(&c.Request)
-			if err != nil {
-				logError("%s", err)
-				return
-			}
-			staticServer.ServeHTTP(adaptor.GetCompatResponseWriter(&c.Response), req)
-		})
-		r.GET("/style.css", func(ctx context.Context, c *app.RequestContext) {
-			staticServer := http.FileServer(http.FS(pages))
-			req, err := adaptor.GetCompatRequest(&c.Request)
-			if err != nil {
-				logError("%s", err)
-				return
-			}
-			staticServer.ServeHTTP(adaptor.GetCompatResponseWriter(&c.Response), req)
-		})
+		router.GET("/", gin.WrapH(http.FileServer(http.FS(pages))))
+		router.GET("/favicon.ico", gin.WrapH(http.FileServer(http.FS(pages))))
+		router.GET("/script.js", gin.WrapH(http.FileServer(http.FS(pages))))
+		router.GET("/style.css", gin.WrapH(http.FileServer(http.FS(pages))))
+		router.GET("/bootstrap.min.css", gin.WrapH(http.FileServer(http.FS(assets))))
+		router.GET("/bootstrap.bundle.min.js", gin.WrapH(http.FileServer(http.FS(assets))))

 	case "external":
 		// 设置外部资源路径
@@ -238,13 +204,20 @@ func setupPages(cfg *config.Config, r *server.Hertz) {
 		faviconPath := fmt.Sprintf("%s/favicon.ico", cfg.Pages.StaticDir)
 		javascriptsPath := fmt.Sprintf("%s/script.js", cfg.Pages.StaticDir)
 		stylesheetsPath := fmt.Sprintf("%s/style.css", cfg.Pages.StaticDir)
-		//bootstrapPath := fmt.Sprintf("%s/bootstrap.min.css", cfg.Pages.StaticDir)
+		bootstrapPath := fmt.Sprintf("%s/bootstrap.min.css", cfg.Pages.StaticDir)
+		bootstrapBundlePath := fmt.Sprintf("%s/bootstrap.bundle.min.js", cfg.Pages.StaticDir)

 		// 设置外部资源路由
-		r.StaticFile("/", indexPagePath)
-		r.StaticFile("/favicon.ico", faviconPath)
-		r.StaticFile("/script.js", javascriptsPath)
-		r.StaticFile("/style.css", stylesheetsPath)
+		router.GET("/", func(c *gin.Context) {
+			c.File(indexPagePath)
+			logInfo("IP:%s UA:%s METHOD:%s HTTPv:%s", c.ClientIP(), c.Request.UserAgent(), c.Request.Method, c.Request.Proto)
+		})
+		router.StaticFile("/favicon.ico", faviconPath)
+		router.StaticFile("/script.js", javascriptsPath)
+		router.StaticFile("/style.css", stylesheetsPath)
+		router.StaticFile("/bootstrap.min.css", bootstrapPath)
+		router.StaticFile("/bootstrap.bundle.min.js", bootstrapBundlePath)
+
 		//router.StaticFile("/bootstrap.min.css", bootstrapPath)

 	default:
@@ -252,48 +225,18 @@ func setupPages(cfg *config.Config, r *server.Hertz) {
 		logWarning("Invalid Pages Mode: %s, using default embedded theme", cfg.Pages.Mode)

 		// 加载嵌入式资源
-		pages, err := loadEmbeddedPages(cfg)
+		pages, assets, err := loadEmbeddedPages(cfg)
 		if err != nil {
 			logError("Failed when processing pages: %s", err)
 			return
 		}
 		// 设置嵌入式资源路由
-		r.GET("/", func(ctx context.Context, c *app.RequestContext) {
-			staticServer := http.FileServer(http.FS(pages))
-			req, err := adaptor.GetCompatRequest(&c.Request)
-			if err != nil {
-				logError("%s", err)
-				return
-			}
-			staticServer.ServeHTTP(adaptor.GetCompatResponseWriter(&c.Response), req)
-		})
-		r.GET("/favicon.ico", func(ctx context.Context, c *app.RequestContext) {
-			staticServer := http.FileServer(http.FS(pages))
-			req, err := adaptor.GetCompatRequest(&c.Request)
-			if err != nil {
-				logError("%s", err)
-				return
-			}
-			staticServer.ServeHTTP(adaptor.GetCompatResponseWriter(&c.Response), req)
-		})
-		r.GET("/script.js", func(ctx context.Context, c *app.RequestContext) {
-			staticServer := http.FileServer(http.FS(pages))
-			req, err := adaptor.GetCompatRequest(&c.Request)
-			if err != nil {
-				logError("%s", err)
-				return
-			}
-			staticServer.ServeHTTP(adaptor.GetCompatResponseWriter(&c.Response), req)
-		})
-		r.GET("/style.css", func(ctx context.Context, c *app.RequestContext) {
-			staticServer := http.FileServer(http.FS(pages))
-			req, err := adaptor.GetCompatRequest(&c.Request)
-			if err != nil {
-				logError("%s", err)
-				return
-			}
-			staticServer.ServeHTTP(adaptor.GetCompatResponseWriter(&c.Response), req)
-		})
+		router.GET("/", gin.WrapH(http.FileServer(http.FS(pages))))
+		router.GET("/favicon.ico", gin.WrapH(http.FileServer(http.FS(pages))))
+		router.GET("/script.js", gin.WrapH(http.FileServer(http.FS(pages))))
+		router.GET("/style.css", gin.WrapH(http.FileServer(http.FS(pages))))
+		router.GET("/bootstrap.min.css", gin.WrapH(http.FileServer(http.FS(assets))))
+		router.GET("/bootstrap.bundle.min.js", gin.WrapH(http.FileServer(http.FS(assets))))
 	}
 }

@@ -314,104 +257,130 @@ func init() {
 	}

 	loadConfig()
-	if cfg != nil { // 在setupLogger前添加空值检查
-		setupLogger(cfg)
-		InitReq(cfg)
-		loadlist(cfg)
-		setupRateLimit(cfg)
+	setupLogger(cfg)
+	InitReq(cfg)
+	loadlist(cfg)
+	setupRateLimit(cfg)

-		if cfg.Server.Debug {
-			runMode = "dev"
-		} else {
-			runMode = "release"
-		}
-
-		if cfg.Server.Debug {
-			version = "Dev" // 如果是Debug模式，版本设置为"Dev"
-		}
+	if cfg.Server.Debug {
+		dev = "true"
+		version = "dev"
 	}
-}
-
-func main() {
-	// 如果 showVersion 为 true，则在 init 阶段已退出，这里直接返回
-	if showVersion || showHelp {
-		return
+	if dev == "true" {
+		gin.SetMode(gin.DebugMode)
+		runMode = "dev"
+	} else {
+		gin.SetMode(gin.ReleaseMode)
+		runMode = "release"
 	}
+
 	logDebug("Run Mode: %s", runMode)

-	// 确保在程序配置加载且非版本显示模式下执行
-	if cfg == nil {
-		fmt.Println("Config not loaded, exiting.")
-		return // 如果配置未加载，则不继续执行
+	gin.LoggerWithWriter(io.Discard)
+	router = gin.New()
+
+	// 添加recovery中间件
+	router.Use(gin.Recovery())
+
+	// 添加log中间件
+	router.Use(loggin.Middleware())
+
+	// 添加计时中间件
+	router.Use(timing.Middleware())
+
+	if cfg.Server.H2C {
+		router.UseH2C = true
 	}

-	addr := fmt.Sprintf("%s:%d", cfg.Server.Host, cfg.Server.Port)
+	setupApi(cfg, router, version)

-	r := server.New(
-		server.WithHostPorts(addr),
-		server.WithH2C(true),
-	)
-
-	r.AddProtocol("h2", factory.NewServerFactory())
-
-	// 添加Recovery中间件
-	r.Use(recovery.Recovery())
-	// 添加log中间件
-	r.Use(loggin.Middleware())
-
-	setupApi(cfg, r, version)
-
-	setupPages(cfg, r)
+	setupPages(cfg, router)

 	// 1. GitHub Releases/Archive - Use distinct path segments for type
-	r.GET("/github.com/:username/:repo/releases/*filepath", func(ctx context.Context, c *app.RequestContext) { // Distinct path for releases
-		proxy.NoRouteHandler(cfg, limiter, iplimiter)(ctx, c)
+	router.GET("/github.com/:username/:repo/releases/*filepath", func(c *gin.Context) { // Distinct path for releases
+		proxy.NoRouteHandler(cfg, limiter, iplimiter, runMode)(c)
 	})

-	r.GET("/github.com/:username/:repo/archive/*filepath", func(ctx context.Context, c *app.RequestContext) { // Distinct path for archive
-		proxy.NoRouteHandler(cfg, limiter, iplimiter)(ctx, c)
+	router.GET("/github.com/:username/:repo/archive/*filepath", func(c *gin.Context) { // Distinct path for archive
+		proxy.NoRouteHandler(cfg, limiter, iplimiter, runMode)(c)
 	})

 	// 2. GitHub Blob/Raw - Use distinct path segments for type
-	r.GET("/github.com/:username/:repo/blob/*filepath", func(ctx context.Context, c *app.RequestContext) { // Distinct path for blob
-		proxy.NoRouteHandler(cfg, limiter, iplimiter)(ctx, c)
+	router.GET("/github.com/:username/:repo/blob/*filepath", func(c *gin.Context) { // Distinct path for blob
+		proxy.NoRouteHandler(cfg, limiter, iplimiter, runMode)(c)
 	})

-	r.GET("/github.com/:username/:repo/raw/*filepath", func(ctx context.Context, c *app.RequestContext) { // Distinct path for raw
-		proxy.NoRouteHandler(cfg, limiter, iplimiter)(ctx, c)
+	router.GET("/github.com/:username/:repo/raw/*filepath", func(c *gin.Context) { // Distinct path for raw
+		proxy.NoRouteHandler(cfg, limiter, iplimiter, runMode)(c)
 	})

-	r.GET("/github.com/:username/:repo/info/*filepath", func(ctx context.Context, c *app.RequestContext) { // Distinct path for info
-		proxy.NoRouteHandler(cfg, limiter, iplimiter)(ctx, c)
+	router.GET("/github.com/:username/:repo/info/*filepath", func(c *gin.Context) { // Distinct path for info
+		proxy.NoRouteHandler(cfg, limiter, iplimiter, runMode)(c)
 	})
-	r.GET("/github.com/:username/:repo/git-upload-pack", func(ctx context.Context, c *app.RequestContext) {
-		proxy.NoRouteHandler(cfg, limiter, iplimiter)(ctx, c)
+	router.GET("/github.com/:username/:repo/git-upload-pack", func(c *gin.Context) {
+		proxy.NoRouteHandler(cfg, limiter, iplimiter, runMode)(c)
 	})

 	// 4. Raw GitHubusercontent - Keep as is (assuming it's distinct enough)
-	r.GET("/raw.githubusercontent.com/:username/:repo/*filepath", func(ctx context.Context, c *app.RequestContext) {
-		proxy.NoRouteHandler(cfg, limiter, iplimiter)(ctx, c)
+	router.GET("/raw.githubusercontent.com/:username/:repo/*filepath", func(c *gin.Context) {
+		proxy.NoRouteHandler(cfg, limiter, iplimiter, runMode)(c)
 	})

 	// 5. Gist GitHubusercontent - Keep as is (assuming it's distinct enough)
-	r.GET("/gist.githubusercontent.com/:username/*filepath", func(ctx context.Context, c *app.RequestContext) {
-		proxy.NoRouteHandler(cfg, limiter, iplimiter)(ctx, c)
+	router.GET("/gist.githubusercontent.com/:username/*filepath", func(c *gin.Context) {
+		proxy.NoRouteHandler(cfg, limiter, iplimiter, runMode)(c)
 	})

 	// 6. GitHub API Repos - Keep as is (assuming it's distinct enough)
-	r.GET("/api.github.com/repos/:username/:repo/*filepath", func(ctx context.Context, c *app.RequestContext) {
-		proxy.NoRouteHandler(cfg, limiter, iplimiter)(ctx, c)
+	router.GET("/api.github.com/repos/:username/:repo/*filepath", func(c *gin.Context) {
+		proxy.NoRouteHandler(cfg, limiter, iplimiter, runMode)(c)
 	})

-	r.NoRoute(func(ctx context.Context, c *app.RequestContext) {
-		proxy.NoRouteHandler(cfg, limiter, iplimiter)(ctx, c)
+	router.NoRoute(func(c *gin.Context) {
+		logInfo(c.Request.URL.Path)
+		proxy.NoRouteHandler(cfg, limiter, iplimiter, runMode)(c)
 	})

 	fmt.Printf("GHProxy Version: %s\n", version)
 	fmt.Printf("A Go Based High-Performance Github Proxy \n")
 	fmt.Printf("Made by WJQSERVER-STUDIO\n")
+}

-	r.Spin()
-	defer logger.Close()
+func main() {
+	if showVersion || showHelp {
+		return
+	}
+
+	server := &http.Server{
+		Addr:    fmt.Sprintf("%s:%d", cfg.Server.Host, cfg.Server.Port),
+		Handler: router,
+	}
+
+	quit := make(chan os.Signal, 1)
+	signal.Notify(quit, syscall.SIGINT, syscall.SIGTERM)
+
+	/*
+		go func() {
+			err := router.Run(fmt.Sprintf("%s:%d", cfg.Server.Host, cfg.Server.Port))
+			if err != nil {
+				logError("Failed to start server: %v\n", err)
+			}
+		}()
+	*/
+
+	go func() {
+		if err := server.ListenAndServe(); err != nil && err != http.ErrServerClosed {
+			logError("Failed to start server: %v\n", err)
+			os.Exit(1)
+		}
+	}()
+
+	<-quit
+	ctx, cancel := context.WithTimeout(context.Background(), 3*time.Second)
+	if err := server.Shutdown(ctx); err != nil {
+		logError("Server forced to shutdown: %v\n", err)
+	}
+	defer cancel()
+	logger.Close()
 	fmt.Println("Program Exit")
 }
--- a/middleware/loggin/loggin.go
+++ b/middleware/loggin/loggin.go
@@ -1,16 +1,16 @@
 package loggin

 import (
-	"context"
+	"ghproxy/middleware/timing"
 	"time"

 	"github.com/WJQSERVER-STUDIO/go-utils/logger"
-	"github.com/cloudwego/hertz/pkg/app"
+	"github.com/gin-gonic/gin"
 )

 var (
 	logw       = logger.Logw
-	logDump    = logger.LogDump
+	LogDump    = logger.LogDump
 	logDebug   = logger.LogDebug
 	logInfo    = logger.LogInfo
 	logWarning = logger.LogWarning
@@ -18,20 +18,17 @@ var (
 )

 // 日志中间件
-func Middleware() app.HandlerFunc {
-	return func(ctx context.Context, c *app.RequestContext) {
-		startTime := time.Now() // 请求开始处理前记录当前时间作为开始时间
+func Middleware() gin.HandlerFunc {
+	return func(c *gin.Context) {
+		// 处理请求
+		c.Next()

-		c.Next(ctx) //  调用 Next() 执行后续的 Handler
+		var timingResults time.Duration

-		endTime := time.Now()                   // 请求处理完成后记录当前时间作为结束时间
-		timingResults := endTime.Sub(startTime) // 计算时间差，得到请求处理耗时 (Duration 类型)
+		// 获取计时结果
+		timingResults, _ = timing.Get(c)

 		// 记录日志 IP METHOD URL USERAGENT PROTOCOL STATUS TIMING
-		//  %s %s %s %s %s %d %s  分别对应:  ClientIP, Method, Protolcol, Path, UserAgent, StatusCode, timingResults (需要格式化)
-		//  %v 可以通用地格式化 time.Duration 类型
-		logInfo("%s %s %s %s %s %d %v ", c.ClientIP(), c.Method(), c.Request.Header.GetProtocol(), string(c.Path()), c.Request.Header.UserAgent(), c.Response.StatusCode(), timingResults)
-
-		//logInfo("%s %s %s %s %d %v ", c.ClientIP(), c.Method(), c.Path(), c.Request.Header.UserAgent(), c.Response.StatusCode(), timingResults)
+		logInfo("%s %s %s %s %d %s ", c.ClientIP(), c.Request.Method, c.Request.URL.Path, c.Request.UserAgent(), c.Writer.Status(), timingResults)
 	}
 }
--- a/middleware/timing/timing.go
+++ b/middleware/timing/timing.go
@@ -0,0 +1,86 @@
+package timing
+
+import (
+	"sync"
+	"time"
+
+	"github.com/gin-gonic/gin"
+)
+
+// 阶段计时结构（固定数组优化）
+type timingData struct {
+	phases [8]struct { // 预分配8个阶段存储
+		name string
+		dur  time.Duration
+	}
+	count int
+	start time.Time
+}
+
+// 对象池（内存重用优化）
+var pool = sync.Pool{
+	New: func() interface{} {
+		return new(timingData)
+	},
+}
+
+// 中间件入口
+func Middleware() gin.HandlerFunc {
+	return func(c *gin.Context) {
+		// 从池中获取计时器
+		td := pool.Get().(*timingData)
+		td.start = time.Now()
+		td.count = 0
+
+		// 存储到上下文
+		c.Set("timing", td)
+
+		// 请求完成后回收对象
+		defer func() {
+			pool.Put(td)
+		}()
+
+		c.Next()
+	}
+}
+
+// 记录阶段耗时
+func Record(c *gin.Context, name string) {
+	if val, exists := c.Get("timing"); exists {
+		//td := val.(*timingData)
+		td, ok := val.(*timingData)
+		if !ok {
+			return
+		}
+		if td.count < len(td.phases) {
+			td.phases[td.count].name = name
+			td.phases[td.count].dur = time.Since(td.start) // 直接记录当前时间
+			td.count++
+		}
+	}
+}
+
+// 获取计时结果（日志输出用）
+func Get(c *gin.Context) (total time.Duration, phases []struct {
+	Name string
+	Dur  time.Duration
+}) {
+	if val, exists := c.Get("timing"); exists {
+		//td := val.(*timingData)
+		td, ok := val.(*timingData)
+		if !ok {
+			return
+		}
+		for i := 0; i < td.count; i++ {
+			phases = append(phases, struct {
+				Name string
+				Dur  time.Duration
+			}{
+				Name: td.phases[i].name,
+				Dur:  td.phases[i].dur,
+			})
+		}
+		total = time.Since(td.start)
+	}
+	return
+}
--- a/proxy/authpass.go
+++ b/proxy/authpass.go
@@ -4,22 +4,22 @@ import (
 	"ghproxy/config"
 	"net/http"

-	"github.com/cloudwego/hertz/pkg/app"
+	"github.com/gin-gonic/gin"
 )

-func AuthPassThrough(c *app.RequestContext, cfg *config.Config, req *http.Request) {
+func AuthPassThrough(c *gin.Context, cfg *config.Config, req *http.Request) {
 	if cfg.Auth.PassThrough {
 		token := c.Query("token")
 		if token != "" {
-			logDebug("%s %s %s %s %s Auth-PassThrough: token %s", c.ClientIP(), c.Method(), string(c.Path()), c.UserAgent(), c.Request.Header.GetProtocol(), token)
+			logDebug("%s %s %s %s %s Auth-PassThrough: token %s", c.ClientIP(), c.Request.Method, c.Request.URL.String(), c.Request.Header.Get("User-Agent"), c.Request.Proto, token)
 			switch cfg.Auth.AuthMethod {
 			case "parameters":
 				if !cfg.Auth.Enabled {
 					req.Header.Set("Authorization", "token "+token)
 				} else {
-					logWarning("%s %s %s %s %s Auth-Error: Conflict Auth Method", c.ClientIP(), c.Method(), string(c.Path()), c.UserAgent(), c.Request.Header.GetProtocol())
+					logWarning("%s %s %s %s %s Auth-Error: Conflict Auth Method", c.ClientIP(), c.Request.Method, c.Request.URL.String(), c.Request.Header.Get("User-Agent"), c.Request.Proto)
 					// 500 Internal Server Error
-					c.JSON(http.StatusInternalServerError, map[string]string{"error": "Conflict Auth Method"})
+					c.JSON(http.StatusInternalServerError, gin.H{"error": "Conflict Auth Method"})
 					return
 				}
 			case "header":
@@ -27,9 +27,9 @@ func AuthPassThrough(c *app.RequestContext, cfg *config.Config, req *http.Reques
 					req.Header.Set("Authorization", "token "+token)
 				}
 			default:
-				logWarning("%s %s %s %s %s Invalid Auth Method / Auth Method is not be set", c.ClientIP(), c.Method(), string(c.Path()), c.UserAgent(), c.Request.Header.GetProtocol())
+				logWarning("%s %s %s %s %s Invalid Auth Method / Auth Method is not be set", c.ClientIP(), c.Request.Method, c.Request.URL.String(), c.Request.Header.Get("User-Agent"), c.Request.Proto)
 				// 500 Internal Server Error
-				c.JSON(http.StatusInternalServerError, map[string]string{"error": "Invalid Auth Method / Auth Method is not be set"})
+				c.JSON(http.StatusInternalServerError, gin.H{"error": "Invalid Auth Method / Auth Method is not be set"})
 				return
 			}
 		}
--- a/proxy/chunkreq.go
+++ b/proxy/chunkreq.go
@@ -2,7 +2,6 @@ package proxy

 import (
 	"bytes"
-	"context"
 	"fmt"
 	"ghproxy/config"
 	"io"
@@ -10,11 +9,10 @@ import (
 	"strconv"

 	"github.com/WJQSERVER-STUDIO/go-utils/copyb"
-	"github.com/cloudwego/hertz/pkg/app"
-	hresp "github.com/cloudwego/hertz/pkg/protocol/http1/resp"
+	"github.com/gin-gonic/gin"
 )

-func ChunkedProxyRequest(ctx context.Context, c *app.RequestContext, u string, cfg *config.Config, matcher string) {
+func ChunkedProxyRequest(c *gin.Context, u string, cfg *config.Config, matcher string) {
 	method := c.Request.Method

 	// 发送HEAD请求, 预获取Content-Length
@@ -46,17 +44,21 @@ func ChunkedProxyRequest(ctx context.Context, c *app.RequestContext, u string, c
 		size, err := strconv.Atoi(contentLength)
 		if err == nil && size > sizelimit {
 			finalURL := headResp.Request.URL.String()
-			c.Redirect(http.StatusMovedPermanently, []byte(finalURL))
-			logWarning("%s %s %s %s %s Final-URL: %s Size-Limit-Exceeded: %d", c.ClientIP(), c.Method(), c.Path(), c.Request.Header.Get("User-Agent"), c.Request.Header.GetProtocol(), finalURL, size)
+			c.Redirect(http.StatusMovedPermanently, finalURL)
+			logWarning("%s %s %s %s %s Final-URL: %s Size-Limit-Exceeded: %d", c.ClientIP(), c.Request.Method, c.Request.URL.String(), c.Request.Header.Get("User-Agent"), c.Request.Proto, finalURL, size)
 			return
 		}
 	}

-	body := c.Request.Body()
+	body, err := readRequestBody(c)
+	if err != nil {
+		HandleError(c, err.Error())
+		return
+	}

 	bodyReader := bytes.NewBuffer(body)

-	req, err := client.NewRequest(string(method()), u, bodyReader)
+	req, err := client.NewRequest(method, u, bodyReader)
 	if err != nil {
 		HandleError(c, fmt.Sprintf("Failed to create request: %v", err))
 		return
@@ -84,8 +86,8 @@ func ChunkedProxyRequest(ctx context.Context, c *app.RequestContext, u string, c
 		size, err := strconv.Atoi(contentLength)
 		if err == nil && size > sizelimit {
 			finalURL := resp.Request.URL.String()
-			c.Redirect(http.StatusMovedPermanently, []byte(finalURL))
-			logWarning("%s %s %s %s %s Final-URL: %s Size-Limit-Exceeded: %d", c.ClientIP(), c.Method(), c.Path(), c.UserAgent(), c.Request.Header.GetProtocol(), finalURL, size)
+			c.Redirect(http.StatusMovedPermanently, finalURL)
+			logWarning("%s %s %s %s %s Final-URL: %s Size-Limit-Exceeded: %d", c.ClientIP(), c.Request.Method, c.Request.URL.String(), c.Request.Header.Get("User-Agent"), c.Request.Proto, finalURL, size)
 			return
 		}
 	}
@@ -118,7 +120,6 @@ func ChunkedProxyRequest(ctx context.Context, c *app.RequestContext, u string, c
 	}

 	c.Status(resp.StatusCode)
-	c.Response.HijackWriter(hresp.NewChunkedBodyWriter(&c.Response, c.GetWriter()))

 	if MatcherShell(u) && matchString(matcher, matchedMatchers) && cfg.Shell.Editor {
 		// 判断body是不是gzip
@@ -127,27 +128,23 @@ func ChunkedProxyRequest(ctx context.Context, c *app.RequestContext, u string, c
 			compress = "gzip"
 		}

-		logInfo("Is Shell: %s %s %s %s %s", c.ClientIP(), method, u, c.Request.Header.Get("User-Agent"), c.Request.Header.GetProtocol())
+		logInfo("Is Shell: %s %s %s %s %s", c.ClientIP(), method, u, c.Request.Header.Get("User-Agent"), c.Request.Proto)
 		c.Header("Content-Length", "")
-
-		//err := ProcessLinksAndWriteChunked(resp.Body, compress, string(c.Request.Host()), cfg, c)
-		_, err := processLinks(resp.Body, c.Response.BodyWriter(), compress, string(c.Request.Host()), cfg)
-
+		_, err = processLinks(resp.Body, c.Writer, compress, c.Request.Host, cfg)
 		if err != nil {
-			logError("%s %s %s %s %s Failed to copy response body: %v", c.ClientIP(), method, u, c.Request.Header.Get("User-Agent"), c.Request.Header.GetProtocol(), err)
+			logError("%s %s %s %s %s Failed to copy response body: %v", c.ClientIP(), method, u, c.Request.Header.Get("User-Agent"), c.Request.Proto, err)
 			return
 		} else {
-			c.Flush() // 确保刷入
+			c.Writer.Flush() // 确保刷入
 		}
 	} else {
-		//err = hwriter.Writer(resp.Body, c)
-		//writer := c.Response.BodyWriter()
-		_, err := copyb.Copy(c.Response.BodyWriter(), resp.Body)
+		//_, err = io.CopyBuffer(c.Writer, resp.Body, nil)
+		_, err = copyb.Copy(c.Writer, resp.Body)
 		if err != nil {
-			logError("%s %s %s %s %s Failed to copy response body: %v", c.ClientIP(), method, u, c.Request.Header.Get("User-Agent"), c.Request.Header.GetProtocol(), err)
+			logError("%s %s %s %s %s Failed to copy response body: %v", c.ClientIP(), method, u, c.Request.Header.Get("User-Agent"), c.Request.Proto, err)
 			return
 		} else {
-			c.Flush() // 确保刷入
+			c.Writer.Flush() // 确保刷入
 		}
 	}
 }
--- a/proxy/gitreq.go
+++ b/proxy/gitreq.go
@@ -2,7 +2,6 @@ package proxy

 import (
 	"bytes"
-	"context"
 	"fmt"
 	"ghproxy/config"
 	"io"
@@ -10,11 +9,12 @@ import (
 	"strconv"

 	"github.com/WJQSERVER-STUDIO/go-utils/copyb"
-	"github.com/cloudwego/hertz/pkg/app"
+	"github.com/gin-gonic/gin"
 )

-func GitReq(ctx context.Context, c *app.RequestContext, u string, cfg *config.Config, mode string) {
-	method := string(c.Request.Method())
+func GitReq(c *gin.Context, u string, cfg *config.Config, mode string, runMode string) {
+	method := c.Request.Method
+	logInfo("%s %s %s %s %s", c.ClientIP(), method, u, c.Request.Header.Get("User-Agent"), c.Request.Proto)

 	logDump("Url Before FMT:%s", u)
 	if cfg.GitClone.Mode == "cache" {
@@ -33,7 +33,11 @@ func GitReq(ctx context.Context, c *app.RequestContext, u string, cfg *config.Co
 		err  error
 	)

-	body := c.Request.Body()
+	body, err := readRequestBody(c)
+	if err != nil {
+		HandleError(c, err.Error())
+		return
+	}

 	bodyReader := bytes.NewBuffer(body)
 	// 创建请求
@@ -83,9 +87,9 @@ func GitReq(ctx context.Context, c *app.RequestContext, u string, cfg *config.Co
 		size, err := strconv.Atoi(contentLength)
 		sizelimit := cfg.Server.SizeLimit * 1024 * 1024
 		if err == nil && size > sizelimit {
-			finalURL := []byte(resp.Request.URL.String())
+			finalURL := resp.Request.URL.String()
 			c.Redirect(http.StatusMovedPermanently, finalURL)
-			logWarning("%s %s %s %s %s Final-URL: %s Size-Limit-Exceeded: %d", c.ClientIP(), c.Method(), c.Path(), c.Request.Header.Get("User-Agent"), c.Request.Header.GetProtocol(), finalURL, size)
+			logWarning("%s %s %s %s %s Final-URL: %s Size-Limit-Exceeded: %d", c.ClientIP(), c.Request.Method, c.Request.URL.String(), c.Request.Header.Get("User-Agent"), c.Request.Proto, finalURL, size)
 			return
 		}
 	}
@@ -118,15 +122,14 @@ func GitReq(ctx context.Context, c *app.RequestContext, u string, cfg *config.Co
 	}

 	c.Status(resp.StatusCode)
-	//err = hwriter.Writer(resp.Body, c)
-	_, err = copyb.Copy(c.Response.BodyWriter(), resp.Body)
+	_, err = copyb.Copy(c.Writer, resp.Body)

 	if err != nil {
-		logError("%s %s %s %s %s Failed to copy response body: %v", c.ClientIP(), method, u, c.Request.Header.Get("User-Agent"), c.Request.Header.GetProtocol(), err)
+		logError("%s %s %s %s %s Failed to copy response body: %v", c.ClientIP(), method, u, c.Request.Header.Get("User-Agent"), c.Request.Proto, err)
 		return
 	} else {

-		c.Flush() // 确保刷入
+		c.Writer.Flush() // 确保刷入
 	}

 }
--- a/proxy/handler.go
+++ b/proxy/handler.go
@@ -1,7 +1,6 @@
 package proxy

 import (
-	"context"
 	"errors"
 	"fmt"
 	"ghproxy/auth"
@@ -11,13 +10,13 @@ import (
 	"regexp"
 	"strings"

-	"github.com/cloudwego/hertz/pkg/app"
+	"github.com/gin-gonic/gin"
 )

 var re = regexp.MustCompile(`^(http:|https:)?/?/?(.*)`) // 匹配http://或https://开头的路径

-func NoRouteHandler(cfg *config.Config, limiter *rate.RateLimiter, iplimiter *rate.IPRateLimiter) app.HandlerFunc {
-	return func(ctx context.Context, c *app.RequestContext) {
+func NoRouteHandler(cfg *config.Config, limiter *rate.RateLimiter, iplimiter *rate.IPRateLimiter, runMode string) gin.HandlerFunc {
+	return func(c *gin.Context) {

 		// 限制访问频率
 		if cfg.RateLimit.Enabled {
@@ -35,19 +34,20 @@ func NoRouteHandler(cfg *config.Config, limiter *rate.RateLimiter, iplimiter *ra
 			}

 			if !allowed {
-				c.JSON(http.StatusTooManyRequests, map[string]string{"error": "Too Many Requests"})
-				logWarning("%s %s %s %s %s 429-TooManyRequests", c.ClientIP(), c.Method(), c.Request.RequestURI(), c.Request.Header.UserAgent(), c.Request.Header.GetProtocol())
+				c.JSON(http.StatusTooManyRequests, gin.H{"error": "Too Many Requests"})
+				logWarning("%s %s %s %s %s 429-TooManyRequests", c.ClientIP(), c.Request.Method, c.Request.URL.RequestURI(), c.Request.Header.Get("User-Agent"), c.Request.Proto)
 				return
 			}
 		}

-		rawPath := strings.TrimPrefix(string(c.Request.RequestURI()), "/") // 去掉前缀/
-		matches := re.FindStringSubmatch(rawPath)                          // 匹配路径
+		//rawPath := strings.TrimPrefix(c.Request.URL.Path, "/") // 去掉前缀/
+		rawPath := strings.TrimPrefix(c.Request.URL.RequestURI(), "/") // 去掉前缀/
+		matches := re.FindStringSubmatch(rawPath)                      // 匹配路径
 		logInfo("Matches: %v", matches)

 		// 匹配路径错误处理
 		if len(matches) < 3 {
-			errMsg := fmt.Sprintf("%s %s %s %s %s Invalid URL", c.ClientIP(), c.Method(), rawPath, c.Request.Header.UserAgent(), c.Request.Header.GetProtocol())
+			errMsg := fmt.Sprintf("%s %s %s %s %s Invalid URL", c.ClientIP(), c.Request.Method, rawPath, c.Request.Header.Get("User-Agent"), c.Request.Proto)
 			logWarning(errMsg)
 			c.String(http.StatusForbidden, "Invalid URL Format. Path: %s", rawPath)
 			return
@@ -71,18 +71,19 @@ func NoRouteHandler(cfg *config.Config, limiter *rate.RateLimiter, iplimiter *ra
 		}
 		username := user

-		logInfo("%s %s %s %s %s Matched-Username: %s, Matched-Repo: %s", c.ClientIP(), c.Method(), rawPath, c.Request.Header.UserAgent(), c.Request.Header.GetProtocol(), username, repo)
-		// dump log 记录详细信息 c.ClientIP(), c.Method(), rawPath,c.Request.Header.UserAgent(), c.Request.Header.GetProtocol(), full Header
-		logDump("%s %s %s %s %s %s", c.ClientIP(), c.Method(), rawPath, c.Request.Header.UserAgent(), c.Request.Header.GetProtocol(), c.Request.Header.Header())
+		logInfo("%s %s %s %s %s Matched-Username: %s, Matched-Repo: %s", c.ClientIP(), c.Request.Method, rawPath, c.Request.Header.Get("User-Agent"), c.Request.Proto, username, repo)
+		// dump log 记录详细信息 c.ClientIP(), c.Request.Method, rawPath, c.Request.Header.Get("User-Agent"), c.Request.Proto, full Header
+		logDump("%s %s %s %s %s %s", c.ClientIP(), c.Request.Method, rawPath, c.Request.Header.Get("User-Agent"), c.Request.Proto, c.Request.Header)
 		repouser := fmt.Sprintf("%s/%s", username, repo)

 		// 白名单检查
 		if cfg.Whitelist.Enabled {
 			whitelist := auth.CheckWhitelist(username, repo)
 			if !whitelist {
+				logErrMsg := fmt.Sprintf("%s %s %s %s %s Whitelist Blocked repo: %s", c.ClientIP(), c.Request.Method, rawPath, c.Request.Header.Get("User-Agent"), c.Request.Proto, repouser)
 				errMsg := fmt.Sprintf("Whitelist Blocked repo: %s", repouser)
-				c.JSON(http.StatusForbidden, map[string]string{"error": errMsg})
-				logWarning("%s %s %s %s %s Whitelist Blocked repo: %s", c.ClientIP(), c.Method(), rawPath, c.Request.Header.UserAgent(), c.Request.Header.GetProtocol(), repouser)
+				c.JSON(http.StatusForbidden, gin.H{"error": errMsg})
+				logWarning(logErrMsg)
 				return
 			}
 		}
@@ -91,9 +92,10 @@ func NoRouteHandler(cfg *config.Config, limiter *rate.RateLimiter, iplimiter *ra
 		if cfg.Blacklist.Enabled {
 			blacklist := auth.CheckBlacklist(username, repo)
 			if blacklist {
+				logErrMsg := fmt.Sprintf("%s %s %s %s %s Blacklist Blocked repo: %s", c.ClientIP(), c.Request.Method, rawPath, c.Request.Header.Get("User-Agent"), c.Request.Proto, repouser)
 				errMsg := fmt.Sprintf("Blacklist Blocked repo: %s", repouser)
-				c.JSON(http.StatusForbidden, map[string]string{"error": errMsg})
-				logWarning("%s %s %s %s %s Blacklist Blocked repo: %s", c.ClientIP(), c.Method(), rawPath, c.Request.Header.UserAgent(), c.Request.Header.GetProtocol(), repouser)
+				c.JSON(http.StatusForbidden, gin.H{"error": errMsg})
+				logWarning(logErrMsg)
 				return
 			}
 		}
@@ -107,22 +109,22 @@ func NoRouteHandler(cfg *config.Config, limiter *rate.RateLimiter, iplimiter *ra

 		// 鉴权
 		var authcheck bool
-		authcheck, err = auth.AuthHandler(ctx, c, cfg)
+		authcheck, err = auth.AuthHandler(c, cfg)
 		if !authcheck {
-			//c.AbortWithStatusJSON(401, gin.H{"error": "Unauthorized"})
-			c.AbortWithStatusJSON(401, map[string]string{"error": "Unauthorized"})
-			logWarning("%s %s %s %s %s Auth-Error: %v", c.ClientIP(), c.Method(), rawPath, c.Request.Header.UserAgent(), c.Request.Header.GetProtocol(), err)
+			c.AbortWithStatusJSON(401, gin.H{"error": "Unauthorized"})
+			logWarning("%s %s %s %s %s Auth-Error: %v", c.ClientIP(), c.Request.Method, rawPath, c.Request.Header.Get("User-Agent"), c.Request.Proto, err)
 			return
 		}

 		// IP METHOD URL USERAGENT PROTO MATCHES
-		logDebug("%s %s %s %s %s Matches: %v", c.ClientIP(), c.Method(), rawPath, c.Request.Header.UserAgent(), c.Request.Header.GetProtocol(), matches)
+		logDebug("%s %s %s %s %s Matches: %v", c.ClientIP(), c.Request.Method, rawPath, c.Request.Header.Get("User-Agent"), c.Request.Proto, matches)

 		switch matcher {
 		case "releases", "blob", "raw", "gist", "api":
-			ChunkedProxyRequest(ctx, c, rawPath, cfg, matcher)
+			ChunkedProxyRequest(c, rawPath, cfg, matcher)
 		case "clone":
-			GitReq(ctx, c, rawPath, cfg, "git")
+			//ProxyRequest(c, rawPath, cfg, "git", runMode)
+			GitReq(c, rawPath, cfg, "git", runMode)
 		default:
 			c.String(http.StatusForbidden, "Invalid input.")
 			fmt.Println("Invalid input.")
--- a/proxy/match.go
+++ b/proxy/match.go
@@ -6,15 +6,9 @@ import (
 	"fmt"
 	"ghproxy/config"
 	"io"
-	"net/http"
 	"net/url"
 	"regexp"
 	"strings"
-	"sync"
-
-	"github.com/cloudwego/hertz/pkg/app"
-	"github.com/cloudwego/hertz/pkg/protocol/http1/resp"
-	"github.com/valyala/bytebufferpool"
 )

 // 定义错误类型, error承载描述, 便于处理
@@ -52,6 +46,19 @@ func Matcher(rawPath string, cfg *config.Config) (string, string, string, error)
 		repo    string
 		matcher string
 	)
+	// 匹配 "https://raw"开头的链接
+	if strings.HasPrefix(rawPath, "https://raw") {
+		remainingPath := strings.TrimPrefix(rawPath, "https://")
+		parts := strings.Split(remainingPath, "/")
+		if len(parts) <= 3 {
+			return "", "", "", ErrInvalidURL
+		}
+		user = parts[1]
+		repo = parts[2]
+		matcher = "raw"
+
+		return user, repo, matcher, nil
+	}
 	// 匹配 "https://github.com"开头的链接
 	if strings.HasPrefix(rawPath, "https://github.com") {
 		remainingPath := strings.TrimPrefix(rawPath, "https://github.com")
@@ -81,19 +88,6 @@ func Matcher(rawPath string, cfg *config.Config) (string, string, string, error)
 		}
 		return user, repo, matcher, nil
 	}
-	// 匹配 "https://raw"开头的链接
-	if strings.HasPrefix(rawPath, "https://raw") {
-		remainingPath := strings.TrimPrefix(rawPath, "https://")
-		parts := strings.Split(remainingPath, "/")
-		if len(parts) <= 3 {
-			return "", "", "", ErrInvalidURL
-		}
-		user = parts[1]
-		repo = parts[2]
-		matcher = "raw"
-
-		return user, repo, matcher, nil
-	}
 	// 匹配 "https://gist"开头的链接
 	if strings.HasPrefix(rawPath, "https://gist") {
 		remainingPath := strings.TrimPrefix(rawPath, "https://")
@@ -135,10 +129,12 @@ func EditorMatcher(rawPath string, cfg *config.Config) (bool, string, error) {
 	)
 	// 匹配 "https://github.com"开头的链接
 	if strings.HasPrefix(rawPath, "https://github.com") {
-		remainingPath := strings.TrimPrefix(rawPath, "https://github.com")
-		if strings.HasPrefix(remainingPath, "/") {
-			remainingPath = strings.TrimPrefix(remainingPath, "/")
-		}
+		/*
+			remainingPath := strings.TrimPrefix(rawPath, "https://github.com")
+			if strings.HasPrefix(remainingPath, "/") {
+				remainingPath = strings.TrimPrefix(remainingPath, "/")
+			}
+		*/
 		return true, "", nil
 	}
 	// 匹配 "https://raw.githubusercontent.com"开头的链接
@@ -158,19 +154,24 @@ func EditorMatcher(rawPath string, cfg *config.Config) (bool, string, error) {
 		return true, matcher, nil
 	}
 	// 匹配 "https://api.github.com/"开头的链接
-	if strings.HasPrefix(rawPath, "https://api.github.com") {
-		matcher = "api"
-		return true, matcher, nil
+	if cfg.Shell.RewriteAPI {
+		if strings.HasPrefix(rawPath, "https://api.github.com") {
+			matcher = "api"
+			return true, matcher, nil
+		}
 	}
 	return false, "", ErrInvalidURL
 }

 // 匹配文件扩展名是sh的rawPath
 func MatcherShell(rawPath string) bool {
-	if strings.HasSuffix(rawPath, ".sh") {
-		return true
-	}
-	return false
+	/*
+		if strings.HasSuffix(rawPath, ".sh") {
+			return true
+		}
+		return false
+	*/
+	return strings.HasSuffix(rawPath, ".sh")
 }

 // LinkProcessor 是一个函数类型，用于处理提取到的链接。
@@ -185,9 +186,9 @@ func modifyURL(url string, host string, cfg *config.Config) string {
 		return url
 	}
 	if matched {
-
-		u := strings.TrimPrefix(url, "https://")
-		u = strings.TrimPrefix(url, "http://")
+		var u = url
+		u = strings.TrimPrefix(u, "https://")
+		u = strings.TrimPrefix(u, "http://")
 		logDump("Modified URL: %s", "https://"+host+"/"+u)
 		return "https://" + host + "/" + u
 	}
@@ -212,168 +213,6 @@ func matchString(target string, stringsToMatch []string) bool {
 	return exists
 }

-func ProcessLinksAndWriteChunked(input io.Reader, compress string, host string, cfg *config.Config, c *app.RequestContext) error {
-	pr, pw := io.Pipe() // 创建一个管道，用于进程间通信
-	var wg sync.WaitGroup
-	wg.Add(2)
-
-	var processErr error // 用于存储处理过程中发生的错误
-
-	go func() {
-		defer wg.Done()  // 协程结束时通知 WaitGroup
-		defer pw.Close() // 协程结束时关闭管道的写端
-
-		var reader *bufio.Reader
-		if compress == "gzip" { // 如果需要解压
-			gzipReader, err := gzip.NewReader(input) // 创建 gzip 解压器
-			if err != nil {
-				c.String(http.StatusInternalServerError, fmt.Sprintf("gzip 解压错误: %v", err)) // 设置 HTTP 状态码和错误信息
-				processErr = fmt.Errorf("gzip decompression error: %w", err)                // gzip decompression error
-				return
-			}
-			defer gzipReader.Close()             // 延迟关闭 gzip 解压器
-			reader = bufio.NewReader(gzipReader) // 使用 bufio 读取解压后的数据
-		} else {
-			reader = bufio.NewReader(input) // 直接使用 bufio 读取原始数据
-		}
-
-		var writer io.Writer = pw // 默认写入管道
-		var gzipWriter *gzip.Writer
-
-		if compress == "gzip" { // 如果需要压缩
-			gzipWriter = gzip.NewWriter(writer) // 创建 gzip 压缩器
-			writer = gzipWriter                 // 将 writer 设置为 gzip 压缩器
-			defer func() {                      // 延迟关闭 gzip 压缩器
-				if err := gzipWriter.Close(); err != nil {
-					logError("gzipWriter close failed: %v", err)
-					processErr = fmt.Errorf("gzipwriter close failed: %w", err) // gzipwriter close failed
-				}
-			}()
-		}
-
-		urlPattern := regexp.MustCompile(`https?://[^\s'"]+`) // 编译正则表达式，用于匹配 URL
-		scanner := bufio.NewScanner(reader)                   // 创建 scanner 用于逐行扫描
-		for scanner.Scan() {                                  // 循环读取每一行
-			line := scanner.Text()                                                                  // 获取当前行
-			modifiedLine := urlPattern.ReplaceAllStringFunc(line, func(originalURL string) string { // 替换 URL
-				return modifyURL(originalURL, host, cfg) // 调用 modifyURL 函数修改 URL
-			})
-			modifiedLineWithNewline := modifiedLine + "\n" // 添加换行符
-
-			_, err := writer.Write([]byte(modifiedLineWithNewline)) // 将修改后的行写入管道/gzip
-			if err != nil {
-				logError("写入 pipe 错误: %v", err)                         // 记录错误
-				processErr = fmt.Errorf("write to pipe error: %w", err) // write to pipe error
-				return
-			}
-		}
-
-		if err := scanner.Err(); err != nil {
-			logError("读取输入错误: %v", err)                                              // 记录错误
-			c.String(http.StatusInternalServerError, fmt.Sprintf("读取输入错误: %v", err)) // 设置 HTTP 状态码和错误信息
-			processErr = fmt.Errorf("read input error: %w", err)                     // read input error
-			return
-		}
-	}()
-
-	go func() {
-		defer wg.Done() // 协程结束时通知 WaitGroup
-
-		c.Response.HijackWriter(resp.NewChunkedBodyWriter(&c.Response, c.GetWriter())) // 劫持 writer，启用分块编码
-
-		bufWrapper := bytebufferpool.Get() // 从对象池获取 bytebuffer
-		buf := bufWrapper.B
-		size := 32768 // 32KB, 设置缓冲区大小
-		buf = buf[:cap(buf)]
-		if len(buf) < size {
-			buf = append(buf, make([]byte, size-len(buf))...)
-		}
-		buf = buf[:size]                     // 将缓冲区限制为 'size'
-		defer bytebufferpool.Put(bufWrapper) // 延迟将 bytebuffer 放回对象池
-
-		for { // 循环读取和写入数据
-			n, err := pr.Read(buf) // 从管道读取数据
-			if err != nil {
-				if err == io.EOF { // 如果读取到文件末尾
-					if n > 0 { // 确保写入所有剩余数据
-						_, err := c.Write(buf[:n]) // 写入最后的数据块
-						if err != nil {
-							processErr = fmt.Errorf("failed to write final chunk: %w", err) // failed to write final chunk
-							break
-						}
-					}
-					c.Flush() // 刷新缓冲区
-					break     // 读取到文件末尾, 退出循环
-				}
-				logError("hwriter.Writer read error: %v", err) // 记录错误
-				if processErr == nil {
-					processErr = fmt.Errorf("failed to read from pipe: %w", err) // failed to read from pipe
-					// 不要在这里设置 http status code. 如果 read 失败, process 协程可能还没有完成, 它可能正在尝试设置 status code. 两个地方都设置会导致 race condition.
-				}
-				break // 读取错误，退出循环
-			}
-
-			if n > 0 { // 只有在实际读取到数据时才写入
-				_, err = c.Write(buf[:n]) // 将数据写入响应
-				if err != nil {
-					// 处理写入错误 (考虑记录日志并可能中止)
-					logError("hwriter.Writer write error: %v", err)
-					if processErr == nil { // 仅当 processErr 尚未设置时才设置.
-						processErr = fmt.Errorf("failed to write chunk: %w", err) // failed to write chunk
-					}
-					break // 写入错误, 退出循环
-				}
-
-				// 在大多数情况下，考虑移除 Flush. 仅在 *真正* 需要时保留它。
-				if err := c.Flush(); err != nil {
-					// 更强大的 Flush() 错误处理
-					c.AbortWithStatus(http.StatusInternalServerError) // 中止响应
-					logError("hwriter.Writer flush error: %v", err)
-					if processErr == nil {
-						processErr = fmt.Errorf("failed to flush chunk: %w", err) // failed to flush chunk
-					}
-					break // 刷新错误, 退出循环
-				}
-			}
-		}
-	}()
-
-	wg.Wait()         // 等待两个协程结束
-	return processErr // 返回错误
-}
-
-// extractParts 从给定的 URL 中提取所需的部分
-func extractParts(rawURL string) (string, string, string, url.Values, error) {
-	// 解析 URL
-	parsedURL, err := url.Parse(rawURL)
-	if err != nil {
-		return "", "", "", nil, err
-	}
-
-	// 获取路径部分并分割
-	pathParts := strings.Split(parsedURL.Path, "/")
-
-	// 提取所需的部分
-	if len(pathParts) < 3 {
-		return "", "", "", nil, fmt.Errorf("URL path is too short")
-	}
-
-	// 提取 /WJQSERVER-STUDIO 和 /go-utils.git
-	repoOwner := "/" + pathParts[1]
-	repoName := "/" + pathParts[2]
-
-	// 剩余部分
-	remainingPath := strings.Join(pathParts[3:], "/")
-	if remainingPath != "" {
-		remainingPath = "/" + remainingPath
-	}
-
-	// 查询参数
-	queryParams := parsedURL.Query()
-
-	return repoOwner, repoName, remainingPath, queryParams, nil
-}
-
 // processLinks 处理链接并将结果写入输出流
 func processLinks(input io.Reader, output io.Writer, compress string, host string, cfg *config.Config) (written int64, err error) {
 	var reader *bufio.Reader
@@ -453,3 +292,35 @@ func processLinks(input io.Reader, output io.Writer, compress string, host strin

 	return written, nil
 }
+
+// extractParts 从给定的 URL 中提取所需的部分
+func extractParts(rawURL string) (string, string, string, url.Values, error) {
+	// 解析 URL
+	parsedURL, err := url.Parse(rawURL)
+	if err != nil {
+		return "", "", "", nil, err
+	}
+
+	// 获取路径部分并分割
+	pathParts := strings.Split(parsedURL.Path, "/")
+
+	// 提取所需的部分
+	if len(pathParts) < 3 {
+		return "", "", "", nil, fmt.Errorf("URL path is too short")
+	}
+
+	// 提取 /WJQSERVER-STUDIO 和 /go-utils.git
+	repoOwner := "/" + pathParts[1]
+	repoName := "/" + pathParts[2]
+
+	// 剩余部分
+	remainingPath := strings.Join(pathParts[3:], "/")
+	if remainingPath != "" {
+		remainingPath = "/" + remainingPath
+	}
+
+	// 查询参数
+	queryParams := parsedURL.Query()
+
+	return repoOwner, repoName, remainingPath, queryParams, nil
+}
--- a/proxy/proxy.go
+++ b/proxy/proxy.go
@@ -2,10 +2,11 @@ package proxy

 import (
 	"fmt"
+	"io"
 	"net/http"

 	"github.com/WJQSERVER-STUDIO/go-utils/logger"
-	"github.com/cloudwego/hertz/pkg/app"
+	"github.com/gin-gonic/gin"
 )

 // 日志模块
@@ -18,7 +19,18 @@ var (
 	logError   = logger.LogError
 )

-func HandleError(c *app.RequestContext, message string) {
+// 读取请求体
+func readRequestBody(c *gin.Context) ([]byte, error) {
+	body, err := io.ReadAll(c.Request.Body)
+	if err != nil {
+		logError("failed to read request body: %v", err)
+		return nil, fmt.Errorf("failed to read request body: %v", err)
+	}
+	defer c.Request.Body.Close()
+	return body, nil
+}
+
+func HandleError(c *gin.Context, message string) {
 	c.String(http.StatusInternalServerError, fmt.Sprintf("server error %v", message))
 	logError(message)
 }
--- a/proxy/reqheader.go
+++ b/proxy/reqheader.go
@@ -4,14 +4,16 @@ import (
 	"net/http"
 	"strings"

-	"github.com/cloudwego/hertz/pkg/app"
+	"github.com/gin-gonic/gin"
 )

 // 设置请求头
-func setRequestHeaders(c *app.RequestContext, req *http.Request) {
-	c.Request.Header.VisitAll(func(key, value []byte) {
-		req.Header.Set(string(key), string(value))
-	})
+func setRequestHeaders(c *gin.Context, req *http.Request) {
+	for key, values := range c.Request.Header {
+		for _, value := range values {
+			req.Header.Set(key, value)
+		}
+	}
 }

 func removeWSHeader(req *http.Request) {
@@ -20,6 +22,7 @@ func removeWSHeader(req *http.Request) {
 }

 func reWriteEncodeHeader(req *http.Request) {
+
 	if isGzipAccepted(req.Header) {
 		req.Header.Set("Content-Encoding", "gzip")
 		req.Header.Set("Accept-Encoding", "gzip")
--- a/timing/timing.go
+++ b/timing/timing.go
@@ -0,0 +1,86 @@
+package timing
+
+import (
+	"sync"
+	"time"
+
+	"github.com/gin-gonic/gin"
+)
+
+// 阶段计时结构（固定数组优化）
+type timingData struct {
+	phases [8]struct { // 预分配8个阶段存储
+		name string
+		dur  time.Duration
+	}
+	count int
+	start time.Time
+}
+
+// 对象池（内存重用优化）
+var pool = sync.Pool{
+	New: func() interface{} {
+		return new(timingData)
+	},
+}
+
+// 中间件入口
+func Middleware() gin.HandlerFunc {
+	return func(c *gin.Context) {
+		// 从池中获取计时器
+		td := pool.Get().(*timingData)
+		td.start = time.Now()
+		td.count = 0
+
+		// 存储到上下文
+		c.Set("timing", td)
+
+		// 请求完成后回收对象
+		defer func() {
+			pool.Put(td)
+		}()
+
+		c.Next()
+	}
+}
+
+// 记录阶段耗时
+func Record(c *gin.Context, name string) {
+	if val, exists := c.Get("timing"); exists {
+		//td := val.(*timingData)
+		td, ok := val.(*timingData)
+		if !ok {
+			return
+		}
+		if td.count < len(td.phases) {
+			td.phases[td.count].name = name
+			td.phases[td.count].dur = time.Since(td.start) // 直接记录当前时间
+			td.count++
+		}
+	}
+}
+
+// 获取计时结果（日志输出用）
+func Get(c *gin.Context) (total time.Duration, phases []struct {
+	Name string
+	Dur  time.Duration
+}) {
+	if val, exists := c.Get("timing"); exists {
+		//td := val.(*timingData)
+		td, ok := val.(*timingData)
+		if !ok {
+			return
+		}
+		for i := 0; i < td.count; i++ {
+			phases = append(phases, struct {
+				Name string
+				Dur  time.Duration
+			}{
+				Name: td.phases[i].name,
+				Dur:  td.phases[i].dur,
+			})
+		}
+		total = time.Since(td.start)
+	}
+	return
+}
Author	SHA1	Message	Date
WJQSERVER	d65fe05336	Merge pull request #79 from WJQSERVER-STUDIO/dev 2.6.2 - 2025-03-29 --- - BACKPORT: 反向移植前端资源加载改进	2025-03-29 11:08:46 +08:00
wjqserver	8adc9c87f9	2.6.2	2025-03-29 11:02:54 +08:00
wjqserver	7e5092179e	optimize frontend load	2025-03-28 10:41:02 +08:00
WJQSERVER	f112e77818	Merge pull request #76 from WJQSERVER-STUDIO/dev 2.6.1	2025-03-28 08:20:29 +08:00
wjqserver	8e5cfd1fac	2.6.1	2025-03-27 12:17:35 +08:00
wjqserver	1cc98ace75	update&sync changelog	2025-03-27 12:01:27 +08:00
wjqserver	b538ff2bd6	25w24a	2025-03-27 11:48:23 +08:00
wjqserver	f383518999	update&sync changelog	2025-03-27 11:47:44 +08:00
wjqserver	174bc14b97	update&sync changelog	2025-03-27 11:46:36 +08:00
wjqserver	15dfab722c	update & fix matcher	2025-03-27 11:24:29 +08:00
wjqserver	470d1d58fa	fix matcher issue	2025-03-27 11:20:39 +08:00
WJQSERVER	b80d25784a	Merge pull request #74 from satomitouka/dev-fix-editor Fix Match modifyURL	2025-03-25 23:49:15 +08:00
里見灯花	1efd9e26b2	Update match.go	2025-03-25 21:44:07 +08:00
wjqserver	4fa91b67cf	update match	2025-03-25 20:22:23 +08:00
wjqserver	ae234e64a8	update deps	2025-03-25 08:20:17 +08:00
wjqserver	87b9f47abc	add graceful shutdown	2025-03-25 08:20:08 +08:00
wjqserver	5685240b41	fix changelog	2025-03-22 21:26:48 +08:00
wjqserver	40f0e3ad06	fix flags wrong	2025-03-22 21:25:48 +08:00
wjqserver	ef783f33c2	[backport] some change form v3	2025-03-22 21:20:47 +08:00
wjqserver	c478409bf8	25w23a	2025-03-22 21:20:07 +08:00
wjqserver	a53e18cb0b	update repo info	2025-03-22 20:57:20 +08:00
wjqserver	0e7abf3411	[backport] add smart-git api	2025-03-22 20:56:57 +08:00
wjqserver	b5db6bcccc	[backport] better cli flags	2025-03-22 20:50:43 +08:00
wjqserver	c1ba935ca4	[backport] add multi theme support	2025-03-22 20:46:08 +08:00
wjqserver	3c247665fc	update	2025-03-22 20:18:30 +08:00
@@ -1 +1 @@
 w22a
 w24a
@@ -1 +1 @@
 .0.2
 .6.2