3.0.2 (fix 3.0.1)

3.0.2 (fix 3.0.1)

.github/workflows/build-dev.yml

@@ -59,6 +59,11 @@ 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:

.github/workflows/build.yml

@@ -56,6 +56,11 @@ 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:

.gitignore

@@ -2,4 +2,6 @@ demo
 demo.toml
 *.log
 *.bak
-list.json
+list.json
+repos
+pages

CHANGELOG.md

@@ -1,5 +1,156 @@
 # 更新日志
 
+3.0.2 - 2025-03-21
+---
+- RELEASE: 在此表达对各位的歉意, v3迁移到HertZ带来了许多问题; 此版本完善v3的同时, 修正已知问题; v3会与v2.4.0及以上版本保证兼容关系, 可平顺升级;
+- FIX: 使用等效`c.Writer()`, 回归v2.5.0 func以修正问题
+- CHANGE: 更新相关依赖
+
+25w22a - 2025-03-21
+---
+- PRE-RELEASE: 此版本是v3.0.1的预发布版本,请勿在生产环境中使用;
+- FIX: 使用等效`c.Writer()`, 回归v2.5.0 func以修正问题
+
+3.0.1 - 2025-03-21
+---
+- RELEASE: Next Step; 下一步; 完善v3的同时, 修正已知问题; v3会与v2.4.0及以上版本保证兼容关系, 可平顺升级;
+- CHANGE: 改进cli
+- CHANGE: 重写`ProcessLinksAndWriteChunked`(脚本嵌套加速处理器), 修正已知问题的同时提高性能与效率
+- CHANGE: 完善`gitreq`部分
+- FIX: 修正日志输出格式问题
+- FIX: 使用更新的`hwriter`以修正相关问题
+
+25w21e - 2025-03-21
+---
+- PRE-RELEASE: 此版本是v3.0.1的预发布版本,请勿在生产环境中使用;
+- CHANGE: 重写`ProcessLinksAndWriteChunked`(脚本嵌套加速处理器), 修正已知问题的同时提高性能与效率
+
+25w21d - 2025-03-21
+---
+- PRE-RELEASE: 此版本是v3.0.1的预发布版本,请勿在生产环境中使用;
+- FIX: 使用更新的`hwriter`以修正相关问题
+
+25w21c - 2025-03-20
+---
+- PRE-RELEASE: 此版本是v3.0.1的预发布版本,请勿在生产环境中使用;
+- TEST: 测试新的`hwriter`
+
+25w21b - 2025-03-20
+---
+- PRE-RELEASE: 此版本是v3.0.1的预发布版本,请勿在生产环境中使用;
+- FIX: 修正日志输出格式问题
+
+25w21a - 2025-03-20
+---
+- PRE-RELEASE: 此版本是v3.0.1的预发布版本,请勿在生产环境中使用;
+- CHANGE: 改进cli
+- CHANGE: 完善`gitreq`部分
+
+3.0.0 - 2025-03-19
+---
+- RELEASE: Next Gen; 下一个起点; v3会与v2.4.0及以上版本保证兼容关系, 可平顺升级;
+- CHANGE: 使用HertZ框架重构, 提升性能
+- CHANGE: 前端在构建时加入, 新增`Design`,`Metro`,`Classic`主题
+- CHANGE: 加入`Mino`主题对接选项
+- FIX: 修正部分日志输出问题
+- CHANGE: 移除gin残留
+- CHANGE: 移除无用传入参数, 调整代码结构
+
+25w20b - 2025-03-19
+---
+- PRE-RELEASE: 此版本是v3.0.0的预发布版本,请勿在生产环境中使用; v3.0.0会与v2.4.0及以上保证兼容关系, 可平顺升级;
+- CHANGE: 加入`Mino`主题对接选项
+- FIX: 修正部分日志输出问题
+- CHANGE: 移除gin残留
+- CHANGE: 移除无用传入参数, 调整代码结构
+
+25w20a - 2025-03-18
+---
+- PRE-RELEASE: 此版本是v3.0.0的预发布版本,请勿在生产环境中使用; v3.0.0会与v2.4.0及以上保证兼容关系, 可平顺升级;
+- CHANGE: 使用HertZ重构
+- CHANGE: 前端在构建时加入, 新增`Design`,`Metro`,`Classic`主题
+
+2.5.0 - 2025-03-17
+---
+- ADD: 加入脚本嵌套加速功能
+- CHANGE: 改进Auth模块
+
+25w19a - 2025-03-16
+---
+- PRE-RELEASE: 此版本是v2.5.0的预发布版本,请勿在生产环境中使用;
+- ADD: 加入脚本嵌套加速功能
+- CHANGE: 改进Auth模块
+- CHANGE: 将handler模块化改进
+
+2.4.2 - 2025-03-14
+---
+- CHANGE: 在GitClone Cache模式下, 相关请求会使用独立httpc client
+- CHANGE: 为GitClone Cache的独立httpc client增加ForceH2C选项
+- FIX: 修正GitClone Cache模式下的Url生成问题
+
+25w18a - 2025-03-14
+---
+- PRE-RELEASE: 此版本是v2.4.2的预发布版本,请勿在生产环境中使用;
+- CHANGE: 在GitClone Cache模式下, 相关请求会使用独立httpc client
+- CHANGE: 为GitClone Cache的独立httpc client增加ForceH2C选项
+- FIX: 修正GitClone Cache模式下的Url生成问题
+
+2.4.1 - 2025-03-13
+---
+- CHANGE: 重构路由匹配
+- CHANGE: 更新相关依赖以修复错误
+
+25w17a - 2025-03-13
+---
+- PRE-RELEASE: 此版本是v2.4.1的预发布版本,请勿在生产环境中使用;
+- CHANGE: 重构路由匹配
+- CHANGE: 更新相关依赖以修复错误
+
+2.4.0 - 2025-03-12
+---
+- ADD: 支持通过[Smart-Git](https://github.com/WJQSERVER-STUDIO/smart-git)实现Git Clone缓存
+- CHANGE: 使用更高性能的Buffer Pool 实现, 调用 github.com/WJQSERVER-STUDIO/go-utils/copyb
+- CHANGE: 改进路由匹配
+- CHANGE: 更新依赖
+- CHANGE: 改进前端
+
+25w16d - 2025-03-12
+---
+- PRE-RELEASE: 此版本是v2.4.0的预发布版本,请勿在生产环境中使用;
+- CHANGE: 使用更高性能的Buffer Pool 实现
+
+25w16c
+---
+- PRE-RELEASE: 此版本是v2.4.0的预发布版本,请勿在生产环境中使用;
+- CHANGE: 使用更高性能的Buffer Pool 实现
+- CHANGE: 改进路由匹配
+
+25w16b
+---
+- PRE-RELEASE: 此版本是v2.4.0的预发布版本,请勿在生产环境中使用;
+- CHANGE: 修改路由
+- CHANGE: 改进前端
+
+25w16a
+---
+- PRE-RELEASE: 此版本是v2.4.0的预发布版本,请勿在生产环境中使用;
+- CHANGE: 变更CORS配置
+- ADD: 使用GO-GIT实现git smart http服务端和客户端
+- CHANGE: 更新依赖
+
+2.3.1
+---
+- CHANGE: 改进`Pages`在`External`模式下的路由
+- CHANGE: 使用`H2C` bool 代替 `enableH2C` string (2.4.0 弃用 `enableH2C`)
+- CHANGE: 使用`Mode` string 代替`Pages`内的 `enable` bool (2.4.0 弃用 `enable`)
+
+25w15a
+---
+- PRE-RELEASE: 此版本是v2.3.1的预发布版本,请勿在生产环境中使用;
+- CHANGE: 改进`Pages`在`External`模式下的路由
+- CHANGE: 使用`H2C` bool 代替 `enableH2C` string (2.4.0 弃用 `enableH2C`)
+- CHANGE: 使用`Mode` string 代替`Pages`内的 `enable` bool (2.4.0 弃用 `enable`)
+
 2.3.0
 ---
 - CHANGE: 使用`touka-httpc`封装`HTTP Client`, 更新到`v0.2.0`版本, 参看`touka-httpc`

DEV-VERSION

@@ -1 +1 @@
-25w14b
+25w22a

README.md

@@ -17,13 +17,16 @@
 ### 项目特点
 
 - 基于Go语言实现,支持多平台
-- 使用[Gin](https://github.com/gin-gonic/gin)作为Web框架
+- 使用字节旗下的[HertZ](https://github.com/cloudwego/hertz)作为Web框架
 - 使用[Touka-HTTPC](https://github.com/satomitouka/touka-httpc)作为HTTP客户端
 - 支持Git clone,raw,realeases等文件拉取
+- 支持多个前端主题
+- 支持自定义黑名单/白名单
+- 支持Git Clone缓存(配合组件)
 - 支持Docker部署
 - 支持速率限制
 - 支持用户鉴权
-- 支持自定义黑名单/白名单
+- 支持shell脚本嵌套加速
 - 基于[WJQSERVER-STUDIO/golang-temp](https://github.com/WJQSERVER-STUDIO/golang-temp)模板构建,具有标准化的日志记录与构建流程
 
 ### 项目开发过程
@@ -31,8 +34,10 @@
 **本项目是[WJQSERVER-STUDIO/ghproxy-go](https://github.com/WJQSERVER-STUDIO/ghproxy-go)的重构版本,实现了原项目原定功能的同时,进一步优化了性能**
 关于此项目的详细开发过程,请参看Commit记录与[CHANGELOG.md](https://github.com/WJQSERVER-STUDIO/ghproxy/blob/main/CHANGELOG.md)
 
-- V2.0.0 对`proxy`核心模块进行了重构,大幅优化内存占用
+- v3.0.0 迁移到HertZ框架, 进一步提升效率, 同时v3.0.0与v2.4.0及以上版本兼容, 可直接平顺升级
-- V1.0.0 迁移至本仓库,并再次重构内容实现
+- v2.4.1 对路径匹配进行优化
+- v2.0.0 对`proxy`核心模块进行了重构,大幅优化内存占用
+- v1.0.0 迁移至本仓库,并再次重构内容实现
 - v0.2.0 重构项目实现
 
 ### LICENSE
@@ -48,9 +53,11 @@
 ```
 # 下载文件
 https://ghproxy.1888866.xyz/raw.githubusercontent.com/WJQSERVER-STUDIO/tools-stable/main/tools-stable-ghproxy.sh
+https://ghproxy.1888866.xyz/https://raw.githubusercontent.com/WJQSERVER-STUDIO/tools-stable/main/tools-stable-ghproxy.sh
 
 # 克隆仓库
 git clone https://ghproxy.1888866.xyz/github.com/WJQSERVER-STUDIO/ghproxy.git
+git clone https://ghproxy.1888866.xyz/https://github.com/WJQSERVER-STUDIO/ghproxy.git
 ```
 
 ## 部署说明
@@ -93,7 +100,8 @@ wget -O install-dev.sh https://raw.githubusercontent.com/WJQSERVER-STUDIO/ghprox
 host = "0.0.0.0"  # 监听地址
 port = 8080  # 监听端口
 sizeLimit = 125 # 125MB
-enableH2C = "on"  # 是否开启H2C传输(latest和dev版本请开启) on/off
+H2C = true # 是否开启H2C传输 
+cors = "*" # "*"/"" -> "*" ; "nil" -> "" ; 除以上特殊情况, 会将值直接传入
 
 [httpc]
 mode = "auto" # "auto" or "advanced" HTTP客户端模式 自动/高级模式
@@ -101,8 +109,16 @@ maxIdleConns = 100 # only for advanced mode 仅用于高级模式
 maxIdleConnsPerHost = 60 # only for advanced mode 仅用于高级模式
 maxConnsPerHost = 0 # only for advanced mode 仅用于高级模式
 
+[gitclone]
+mode = "bypass" # bypass / cache 运行模式, cache模式依赖smart-git
+smartGitAddr = "http://127.0.0.1:8080" # smart-git组件地址
+ForceH2C = false # 强制使用H2C连接
+
+[shell]
+editor = false # 脚本嵌套加速
+
 [pages]
-enabled = false  # 是否开启外置静态页面(Docker版本请关闭此项)
+mode = "internal" # "internal" or "external" 内部/外部 前端 默认内部
 theme = "bootstrap" # "bootstrap" or "nebula" 内置主题
 staticPath = "/data/www"  # 静态页面文件路径
 
@@ -111,13 +127,11 @@ logFilePath = "/data/ghproxy/log/ghproxy.log" # 日志文件路径
 maxLogSize = 5 # MB 日志文件最大大小
 level = "info"  # 日志级别 dump, debug, info, warn, error, none
 
-[cors]
-enabled = true  # 是否开启跨域
-
 [auth]
 authMethod = "parameters" # 鉴权方式,支持parameters,header
 authToken = "token"  # 用户鉴权Token
 enabled = false  # 是否开启用户鉴权
+ForceAllowApi = false # 在不开启Header鉴权的情况下允许api代理
 
 [blacklist]
 blacklistFile = "/data/ghproxy/config/blacklist.json"  # 黑名单文件路径
@@ -168,19 +182,16 @@ url = "socks5://127.0.0.1:1080" # "http://127.0.0.1:7890" 支持Socks5/HTTP(S)
   }
 ```
 
-### Caddy反代配置
-
-```Caddyfile
-example.com {
-    reverse_proxy * 127.0.0.1:7210
-}
-```
-
 ### 前端页面
 
+#### Bootstrap主题
 ![ghproxy-demo.png](https://webp.wjqserver.com/ghproxy/1.8.1-light.png)
 ![ghproxy-demo-dark.png](https://webp.wjqserver.com/ghproxy/1.8.1-dark.png)
 
+#### Nebula主题
+![nebula-dark-v2.3.0.png](https://webp.wjqserver.com/ghproxy/nebula-dark.png)
+![nebula-light-v2.3.0.png](https://webp.wjqserver.com/ghproxy/nebula-light.png)
+
 ## 赞助
 
 如果您觉得本项目对您有帮助,欢迎赞助支持,您的赞助将用于Demo服务器开支及开发者时间成本支出,感谢您的支持!
@@ -189,6 +200,10 @@ example.com {
 
 爱发电: https://afdian.com/a/wjqserver
 
+USDT(TRC20): `TNfSYG6F2vkiibd6J6mhhHNWDgWgNdF5hN`
+
 ### 捐赠列表
 
-虚位以待...
+| 赞助人    |金额|
+|--------|------|
+| starry | 8 USDT (TRC20)   |

SECURITY.MD

@@ -6,8 +6,9 @@
 
 | 版本 | 是否支持 |
 | --- | --- |
-| v2.x.x | :white_check_mark: 当前最新版本序列, 受支持 |
+| v3.x.x | :white_check_mark: 当前最新版本序列 |
-| v1.x.x | :x: 这些版本已结束生命周期,不再受支持 |
+| v2.x.x | :x: 这些版本已结束生命周期,不受支持 |
+| v1.x.x | :x: 这些版本已结束生命周期,不受支持 |
 | 25w*a/b/c... | :warning: 此为PRE-RELEASE版本,用于开发与测试,可能存在未知的问题 |
 | 24w*a/b/c... | :warning: 此为PRE-RELEASE版本,用于开发与测试,可能存在未知的问题 生命周期已完全结束 |
 | v0.x.x | :x: 这些版本不再受支持 |

VERSION

@@ -1 +1 @@
-2.3.0
+3.0.2

api/api.go

@@ -1,129 +1,137 @@
 package api
 
 import (
-	"encoding/json"
+	"context"
 	"ghproxy/config"
 
 	"github.com/WJQSERVER-STUDIO/go-utils/logger"
-	"github.com/gin-gonic/gin"
+	"github.com/cloudwego/hertz/pkg/app"
-)
+	"github.com/cloudwego/hertz/pkg/app/server"
-
-var (
-	router *gin.Engine
-	cfg    *config.Config
 )
 
 var (
 	logw       = logger.Logw
-	LogDump    = logger.LogDump
+	logDump    = logger.LogDump
 	logDebug   = logger.LogDebug
 	logInfo    = logger.LogInfo
 	logWarning = logger.LogWarning
 	logError   = logger.LogError
 )
 
-func NoCacheMiddleware() gin.HandlerFunc {
+func NoCacheMiddleware() app.HandlerFunc {
-	return func(c *gin.Context) {
+	return func(ctx context.Context, c *app.RequestContext) {
 		// 设置禁止缓存的响应头
-		c.Header("Cache-Control", "no-store, no-cache, must-revalidate")
+		c.Response.Header.Set("Cache-Control", "no-store, no-cache, must-revalidate")
-		c.Header("Pragma", "no-cache")
+		c.Response.Header.Set("Pragma", "no-cache")
-		c.Header("Expires", "0")
+		c.Response.Header.Set("Expires", "0")
-		c.Next() // 继续处理请求
+		c.Next(ctx) // 继续处理请求
 	}
 }
 
-func InitHandleRouter(cfg *config.Config, router *gin.Engine, version string) {
+func InitHandleRouter(cfg *config.Config, r *server.Hertz, version string) {
-	apiRouter := router.Group("api", NoCacheMiddleware())
+	apiRouter := r.Group("/api", NoCacheMiddleware())
 	{
-		apiRouter.GET("/size_limit", func(c *gin.Context) {
+		apiRouter.GET("/size_limit", func(ctx context.Context, c *app.RequestContext) {
-			SizeLimitHandler(cfg, c)
+			SizeLimitHandler(cfg, c, ctx)
 		})
-		apiRouter.GET("/whitelist/status", func(c *gin.Context) {
+		apiRouter.GET("/whitelist/status", func(ctx context.Context, c *app.RequestContext) {
-			WhiteListStatusHandler(c, cfg)
+			WhiteListStatusHandler(cfg, c, ctx)
 		})
-		apiRouter.GET("/blacklist/status", func(c *gin.Context) {
+		apiRouter.GET("/blacklist/status", func(ctx context.Context, c *app.RequestContext) {
-			BlackListStatusHandler(c, cfg)
+			BlackListStatusHandler(cfg, c, ctx)
 		})
-		apiRouter.GET("/cors/status", func(c *gin.Context) {
+		apiRouter.GET("/cors/status", func(ctx context.Context, c *app.RequestContext) {
-			CorsStatusHandler(c, cfg)
+			CorsStatusHandler(cfg, c, ctx)
 		})
-		apiRouter.GET("/healthcheck", func(c *gin.Context) {
+		apiRouter.GET("/healthcheck", func(ctx context.Context, c *app.RequestContext) {
-			HealthcheckHandler(c)
+			HealthcheckHandler(c, ctx)
 		})
-		apiRouter.GET("/version", func(c *gin.Context) {
+		apiRouter.GET("/version", func(ctx context.Context, c *app.RequestContext) {
-			VersionHandler(c, version)
+			VersionHandler(c, ctx, version)
 		})
-		apiRouter.GET("/rate_limit/status", func(c *gin.Context) {
+		apiRouter.GET("/rate_limit/status", func(ctx context.Context, c *app.RequestContext) {
-			RateLimitStatusHandler(c, cfg)
+			RateLimitStatusHandler(cfg, c, ctx)
 		})
-		apiRouter.GET("/rate_limit/limit", func(c *gin.Context) {
+		apiRouter.GET("/rate_limit/limit", func(ctx context.Context, c *app.RequestContext) {
-			RateLimitLimitHandler(c, cfg)
+			RateLimitLimitHandler(cfg, c, ctx)
 		})
+		apiRouter.GET("/smartgit/status", func(ctx context.Context, c *app.RequestContext) {
+			SmartGitStatusHandler(cfg, c, ctx)
+		})
+
 	}
 	logInfo("API router Init success")
 }
 
-func SizeLimitHandler(cfg *config.Config, c *gin.Context) {
+func SizeLimitHandler(cfg *config.Config, c *app.RequestContext, ctx context.Context) {
 	sizeLimit := cfg.Server.SizeLimit
-	logInfo("%s %s %s %s %s", c.ClientIP(), c.Request.Method, c.Request.URL.Path, c.Request.UserAgent(), c.Request.Proto)
+	logInfo("%s %s %s %s %s", c.ClientIP(), c.Method(), string(c.Path()), c.Request.Header.UserAgent(), c.Request.Header.GetProtocol())
-	c.Writer.Header().Set("Content-Type", "application/json")
+	c.Response.Header.Set("Content-Type", "application/json")
-	json.NewEncoder(c.Writer).Encode(map[string]interface{}{
+	c.JSON(200, (map[string]interface{}{
 		"MaxResponseBodySize": sizeLimit,
-	})
+	}))
 }
 
-func WhiteListStatusHandler(c *gin.Context, cfg *config.Config) {
+func WhiteListStatusHandler(cfg *config.Config, c *app.RequestContext, ctx context.Context) {
-	logInfo("%s %s %s %s %s", c.ClientIP(), c.Request.Method, c.Request.URL.Path, c.Request.UserAgent(), c.Request.Proto)
+	logInfo("%s %s %s %s %s", c.ClientIP(), c.Method(), string(c.Path()), c.Request.Header.UserAgent(), c.Request.Header.GetProtocol())
-	c.Writer.Header().Set("Content-Type", "application/json")
+	c.Response.Header.Set("Content-Type", "application/json")
-	json.NewEncoder(c.Writer).Encode(map[string]interface{}{
+	c.JSON(200, (map[string]interface{}{
 		"Whitelist": cfg.Whitelist.Enabled,
-	})
+	}))
 }
 
-func BlackListStatusHandler(c *gin.Context, cfg *config.Config) {
+func BlackListStatusHandler(cfg *config.Config, c *app.RequestContext, ctx context.Context) {
-	logInfo("%s %s %s %s %s", c.ClientIP(), c.Request.Method, c.Request.URL.Path, c.Request.UserAgent(), c.Request.Proto)
+	logInfo("%s %s %s %s %s", c.ClientIP(), c.Method(), string(c.Path()), c.Request.Header.UserAgent(), c.Request.Header.GetProtocol())
-	c.Writer.Header().Set("Content-Type", "application/json")
+	c.Response.Header.Set("Content-Type", "application/json")
-	json.NewEncoder(c.Writer).Encode(map[string]interface{}{
+	c.JSON(200, (map[string]interface{}{
 		"Blacklist": cfg.Blacklist.Enabled,
-	})
+	}))
 }
 
-func CorsStatusHandler(c *gin.Context, cfg *config.Config) {
+func CorsStatusHandler(cfg *config.Config, c *app.RequestContext, ctx context.Context) {
-	logInfo("%s %s %s %s %s", c.ClientIP(), c.Request.Method, c.Request.URL.Path, c.Request.UserAgent(), c.Request.Proto)
+	logInfo("%s %s %s %s %s", c.ClientIP(), c.Method(), string(c.Path()), c.Request.Header.UserAgent(), c.Request.Header.GetProtocol())
-	c.Writer.Header().Set("Content-Type", "application/json")
+	c.Response.Header.Set("Content-Type", "application/json")
-	json.NewEncoder(c.Writer).Encode(map[string]interface{}{
+	c.JSON(200, (map[string]interface{}{
-		"Cors": cfg.CORS.Enabled,
+		"Cors": cfg.Server.Cors,
-	})
+	}))
 }
 
-func HealthcheckHandler(c *gin.Context) {
+func HealthcheckHandler(c *app.RequestContext, ctx context.Context) {
-	logInfo("%s %s %s %s %s", c.ClientIP(), c.Request.Method, c.Request.URL.Path, c.Request.UserAgent(), c.Request.Proto)
+	logInfo("%s %s %s %s %s", c.ClientIP(), c.Method(), string(c.Path()), c.Request.Header.UserAgent(), c.Request.Header.GetProtocol())
-	c.Writer.Header().Set("Content-Type", "application/json")
+	c.Response.Header.Set("Content-Type", "application/json")
-	json.NewEncoder(c.Writer).Encode(map[string]interface{}{
+	c.JSON(200, (map[string]interface{}{
 		"Status": "OK",
-	})
+	}))
 }
 
-func VersionHandler(c *gin.Context, version string) {
+func VersionHandler(c *app.RequestContext, ctx context.Context, version string) {
-	logInfo("%s %s %s %s %s", c.ClientIP(), c.Request.Method, c.Request.URL.Path, c.Request.UserAgent(), c.Request.Proto)
+	logInfo("%s %s %s %s %s", c.ClientIP(), c.Method(), string(c.Path()), c.Request.Header.UserAgent(), c.Request.Header.GetProtocol())
-	c.Writer.Header().Set("Content-Type", "application/json")
+	c.Response.Header.Set("Content-Type", "application/json")
-	json.NewEncoder(c.Writer).Encode(map[string]interface{}{
+	c.JSON(200, (map[string]interface{}{
 		"Version": version,
-	})
+	}))
 }
 
-func RateLimitStatusHandler(c *gin.Context, cfg *config.Config) {
+func RateLimitStatusHandler(cfg *config.Config, c *app.RequestContext, ctx context.Context) {
-	logInfo("%s %s %s %s %s", c.ClientIP(), c.Request.Method, c.Request.URL.Path, c.Request.UserAgent(), c.Request.Proto)
+	logInfo("%s %s %s %s %s", c.ClientIP(), c.Method(), string(c.Path()), c.Request.Header.UserAgent(), c.Request.Header.GetProtocol())
-	c.Writer.Header().Set("Content-Type", "application/json")
+	c.Response.Header.Set("Content-Type", "application/json")
-	json.NewEncoder(c.Writer).Encode(map[string]interface{}{
+	c.JSON(200, (map[string]interface{}{
 		"RateLimit": cfg.RateLimit.Enabled,
-	})
+	}))
 }
 
-func RateLimitLimitHandler(c *gin.Context, cfg *config.Config) {
+func RateLimitLimitHandler(cfg *config.Config, c *app.RequestContext, ctx context.Context) {
-	logInfo("%s %s %s %s %s", c.ClientIP(), c.Request.Method, c.Request.URL.Path, c.Request.UserAgent(), c.Request.Proto)
+	logInfo("%s %s %s %s %s", c.ClientIP(), c.Method(), string(c.Path()), c.Request.Header.UserAgent(), c.Request.Header.GetProtocol())
-	c.Writer.Header().Set("Content-Type", "application/json")
+	c.Response.Header.Set("Content-Type", "application/json")
-	json.NewEncoder(c.Writer).Encode(map[string]interface{}{
+	c.JSON(200, (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{}{
+		"enabled": cfg.GitClone.Mode == "cache",
+	}))
 }

auth/auth-header.go

@@ -4,26 +4,24 @@ import (
 	"fmt"
 	"ghproxy/config"
 
-	"github.com/gin-gonic/gin"
+	"github.com/cloudwego/hertz/pkg/app"
 )
 
-func AuthHeaderHandler(c *gin.Context, cfg *config.Config) (isValid bool, err string) {
+func AuthHeaderHandler(c *app.RequestContext, cfg *config.Config) (isValid bool, err error) {
 	if !cfg.Auth.Enabled {
-		return true, ""
+		return true, nil
 	}
 	// 获取"GH-Auth"的值
-	authToken := c.GetHeader("GH-Auth")
+	authToken := string(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)
+	logDebug("%s %s %s %s %s AUTH_TOKEN: %s", c.Method(), string(c.Path()), c.Request.Header.UserAgent(), c.Request.Header.GetProtocol(), authToken)
 	if authToken == "" {
-		err := "Auth Header == nil"
+		return false, fmt.Errorf("Auth token not found")
-		return false, err
 	}
 
 	isValid = authToken == cfg.Auth.AuthToken
 	if !isValid {
-		err := fmt.Sprintf("Auth token incorrect: %s", authToken)
+		return false, fmt.Errorf("Auth token incorrect")
-		return false, err
 	}
 
-	return isValid, ""
+	return isValid, nil
 }

auth/auth-parameters.go

@@ -4,27 +4,25 @@ import (
 	"fmt"
 	"ghproxy/config"
 
-	"github.com/gin-gonic/gin"
+	"github.com/cloudwego/hertz/pkg/app"
 )
 
-func AuthParametersHandler(c *gin.Context, cfg *config.Config) (isValid bool, err string) {
+func AuthParametersHandler(c *app.RequestContext, cfg *config.Config) (isValid bool, err error) {
 	if !cfg.Auth.Enabled {
-		return true, ""
+		return true, nil
 	}
 
 	authToken := c.Query("auth_token")
-	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)
+	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)
 
 	if authToken == "" {
-		err := "Auth token == nil"
+		return false, fmt.Errorf("Auth token not found")
-		return false, err
 	}
 
 	isValid = authToken == cfg.Auth.AuthToken
 	if !isValid {
-		err := fmt.Sprintf("Auth token incorrect: %s", authToken)
+		return false, fmt.Errorf("Auth token invalid")
-		return false, err
 	}
 
-	return isValid, ""
+	return isValid, nil
 }

auth/auth.go

@@ -1,15 +1,17 @@
 package auth
 
 import (
+	"context"
+	"fmt"
 	"ghproxy/config"
 
 	"github.com/WJQSERVER-STUDIO/go-utils/logger"
-	"github.com/gin-gonic/gin"
+	"github.com/cloudwego/hertz/pkg/app"
 )
 
 var (
 	logw       = logger.Logw
-	LogDump    = logger.LogDump
+	logDump    = logger.LogDump
 	logDebug   = logger.LogDebug
 	logInfo    = logger.LogInfo
 	logWarning = logger.LogWarning
@@ -34,7 +36,7 @@ func Init(cfg *config.Config) {
 	logDebug("Auth Init")
 }
 
-func AuthHandler(c *gin.Context, cfg *config.Config) (isValid bool, err string) {
+func AuthHandler(ctx context.Context, c *app.RequestContext, cfg *config.Config) (isValid bool, err error) {
 	if cfg.Auth.AuthMethod == "parameters" {
 		isValid, err = AuthParametersHandler(c, cfg)
 		return isValid, err
@@ -43,9 +45,9 @@ func AuthHandler(c *gin.Context, cfg *config.Config) (isValid bool, err string)
 		return isValid, err
 	} else if cfg.Auth.AuthMethod == "" {
 		logError("Auth method not set")
-		return true, ""
+		return true, nil
 	} else {
 		logError("Auth method not supported")
-		return false, "Auth method not supported"
+		return false, fmt.Errorf(fmt.Sprintf("Auth method %s not supported", cfg.Auth.AuthMethod))
 	}
 }

config/config.go

@@ -7,9 +7,10 @@ import (
 type Config struct {
 	Server    ServerConfig
 	Httpc     HttpcConfig
+	GitClone  GitCloneConfig
+	Shell     ShellConfig
 	Pages     PagesConfig
 	Log       LogConfig
-	CORS      CORSConfig
 	Auth      AuthConfig
 	Blacklist BlacklistConfig
 	Whitelist WhitelistConfig
@@ -17,11 +18,20 @@ type Config struct {
 	Outbound  OutboundConfig
 }
 
+/*
+[server]
+host = "0.0.0.0"  # 监听地址
+port = 8080  # 监听端口
+sizeLimit = 125 # 125MB
+H2C = true # 是否开启H2C传输
+*/
+
 type ServerConfig struct {
 	Port      int    `toml:"port"`
 	Host      string `toml:"host"`
 	SizeLimit int    `toml:"sizeLimit"`
-	EnableH2C string `toml:"enableH2C"`
+	H2C       bool   `toml:"H2C"`
+	Cors      string `toml:"cors"`
 	Debug     bool   `toml:"debug"`
 }
 
@@ -39,14 +49,34 @@ type HttpcConfig struct {
 	MaxConnsPerHost     int    `toml:"maxConnsPerHost"`
 }
 
+/*
+[gitclone]
+mode = "bypass" # bypass / cache
+smartGitAddr = "http://127.0.0.1:8080"
+ForceH2C = true
+*/
+type GitCloneConfig struct {
+	Mode         string `toml:"mode"`
+	SmartGitAddr string `toml:"smartGitAddr"`
+	ForceH2C     bool   `toml:"ForceH2C"`
+}
+
+/*
+[shell]
+editor = true
+*/
+type ShellConfig struct {
+	Editor bool `toml:"editor"`
+}
+
 /*
 [pages]
-enabled = false
+mode = "internal" # "internal" or "external"
-theme = "bootstrap" # "bootstrap" or "nebula"
+theme = "bootstrap" # "bootstrap" or "nebula" or "design" or "classic"
 staticDir = "/data/www"
 */
 type PagesConfig struct {
-	Enabled   bool   `toml:"enabled"`
+	Mode      string `toml:"mode"`
 	Theme     string `toml:"theme"`
 	StaticDir string `toml:"staticDir"`
 }
@@ -57,15 +87,20 @@ type LogConfig struct {
 	Level       string `toml:"level"`
 }
 
-type CORSConfig struct {
+/*
-	Enabled bool `toml:"enabled"`
+[auth]
-}
+authMethod = "parameters" # "header" or "parameters"
-
+authToken = "token"
+enabled = false
+passThrough = false
+ForceAllowApi = true
+*/
 type AuthConfig struct {
-	Enabled     bool   `toml:"enabled"`
+	Enabled       bool   `toml:"enabled"`
-	AuthMethod  string `toml:"authMethod"`
+	AuthMethod    string `toml:"authMethod"`
-	AuthToken   string `toml:"authToken"`
+	AuthToken     string `toml:"authToken"`
-	PassThrough bool   `toml:"passThrough"`
+	PassThrough   bool   `toml:"passThrough"`
+	ForceAllowApi bool   `toml:"ForceAllowApi"`
 }
 
 type BlacklistConfig struct {

config/config.toml

@@ -2,7 +2,8 @@
 host = "0.0.0.0" 
 port = 8080 
 sizeLimit = 125 # MB
-enableH2C = "on" # "on" or "off"
+H2C = true
+cors = "*" # "*"/"" -> "*" ; "nil" -> "" ;
 debug = false
 
 [httpc]
@@ -11,8 +12,16 @@ maxIdleConns = 100 # only for advanced mode
 maxIdleConnsPerHost = 60 # only for advanced mode
 maxConnsPerHost = 0 # only for advanced mode
 
+[gitclone]
+mode = "bypass" # bypass / cache
+smartGitAddr = "http://127.0.0.1:8080"
+ForceH2C = false
+
+[shell]
+editor = false
+
 [pages]
-enabled = false
+mode = "internal" # "internal" or "external"
 theme = "bootstrap" # "bootstrap" or "nebula"
 staticDir = "/data/www" 
 
@@ -21,14 +30,12 @@ logFilePath = "/data/ghproxy/log/ghproxy.log"
 maxLogSize = 5 # MB
 level = "info" # dump, debug, info, warn, error, none
 
-[cors]
-enabled = true
-
 [auth]
 authMethod = "parameters" # "header" or "parameters"
 authToken = "token"
 enabled = false
 passThrough = false
+ForceAllowApi = false
 
 [blacklist]
 blacklistFile = "/data/ghproxy/config/blacklist.json"

deploy/config.toml

@@ -2,7 +2,8 @@
 host = "127.0.0.1" 
 port = 8080 
 sizeLimit = 125 # MB
-enableH2C = "on"
+H2C = true
+cors = "*" # "*"/"" -> "*" ; "nil" -> "" ;
 debug = false
 
 [httpc]
@@ -11,8 +12,16 @@ maxIdleConns = 100 # only for advanced mode
 maxIdleConnsPerHost = 60 # only for advanced mode
 maxConnsPerHost = 0 # only for advanced mode
 
+[gitclone]
+mode = "bypass" # bypass / cache
+smartGitAddr = "http://127.0.0.1:8080"
+ForceH2C = false
+
+[shell]
+editor = false
+
 [pages]
-enabled = false
+mode = "internal" # "internal" or "external"
 theme = "bootstrap" # "bootstrap" or "nebula"
 staticDir = "/usr/local/ghproxy/pages" 
 
@@ -21,14 +30,12 @@ logFilePath = "/usr/local/ghproxy/log/ghproxy.log"
 maxLogSize = 5 # MB
 level = "info" # dump, debug, info, warn, error, none
 
-[cors]
-enabled = true
-
 [auth]
 authMethod = "parameters" # "header" or "parameters"
 authToken = "token"
 enabled = false
 passThrough = false
+ForceAllowApi = false
 
 [blacklist]
 blacklistFile = "/usr/local/ghproxy/config/blacklist.json"

go.mod

@@ -1,40 +1,38 @@
 module ghproxy
 
-go 1.24.0
+go 1.24.1
 
 require (
-	github.com/BurntSushi/toml v1.4.0
+	github.com/BurntSushi/toml v1.5.0
-	github.com/WJQSERVER-STUDIO/go-utils/logger v1.3.0
+	github.com/WJQSERVER-STUDIO/go-utils/copyb v0.0.4
-	github.com/gin-gonic/gin v1.10.0
+	github.com/WJQSERVER-STUDIO/go-utils/logger v1.5.0
-	github.com/satomitouka/touka-httpc v0.2.0
+	github.com/cloudwego/hertz v0.9.6
-	golang.org/x/net v0.35.0
+	github.com/hertz-contrib/http2 v0.1.8
-	golang.org/x/time v0.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/time v0.11.0
 )
 
 require (
-	github.com/bytedance/sonic v1.12.8 // indirect
+	github.com/WJQSERVER-STUDIO/go-utils/log v0.0.1 // indirect
-	github.com/bytedance/sonic/loader v0.2.3 // 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/gabriel-vasile/mimetype v1.4.8 // indirect
+	github.com/cloudwego/netpoll v0.6.5 // indirect
-	github.com/gin-contrib/sse v1.0.0 // indirect
+	github.com/fsnotify/fsnotify v1.8.0 // indirect
-	github.com/go-playground/locales v0.14.1 // indirect
+	github.com/google/go-cmp v0.7.0 // indirect
-	github.com/go-playground/universal-translator v0.18.1 // indirect
+	github.com/klauspost/cpuid/v2 v2.2.10 // indirect
-	github.com/go-playground/validator/v10 v10.25.0 // indirect
+	github.com/nyaruka/phonenumbers v1.6.0 // indirect
-	github.com/goccy/go-json v0.10.5 // indirect
+	github.com/stretchr/objx v0.5.2 // indirect
-	github.com/google/go-cmp v0.6.0 // indirect
+	github.com/tidwall/gjson v1.18.0 // indirect
-	github.com/json-iterator/go v1.1.12 // indirect
+	github.com/tidwall/match v1.1.1 // indirect
-	github.com/klauspost/cpuid/v2 v2.2.9 // indirect
+	github.com/tidwall/pretty v1.2.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/twitchyliquid64/golang-asm v0.15.1 // indirect
-	github.com/ugorji/go/codec v1.2.12 // indirect
+	golang.org/x/arch v0.15.0 // indirect
-	golang.org/x/arch v0.14.0 // indirect
+	golang.org/x/exp v0.0.0-20250305212735-054e65f0b394 // indirect
-	golang.org/x/crypto v0.33.0 // indirect
+	golang.org/x/sys v0.31.0 // indirect
-	golang.org/x/sys v0.30.0 // indirect
+	golang.org/x/text v0.23.0 // indirect
-	golang.org/x/text v0.22.0 // indirect
 	google.golang.org/protobuf v1.36.5 // indirect
-	gopkg.in/yaml.v3 v3.0.1 // indirect
 )

go.sum

@@ -1,90 +1,98 @@
-github.com/BurntSushi/toml v1.4.0 h1:kuoIxZQy2WRRk1pttg9asf+WVv6tWQuBNVmK8+nqPr0=
+github.com/BurntSushi/toml v1.5.0 h1:W5quZX/G/csjUnuI8SUYlsHs9M38FC7znL0lIO+DvMg=
-github.com/BurntSushi/toml v1.4.0/go.mod h1:ukJfTF/6rtPPRCnwkur4qwRxa8vTRFBF0uk2lLoLwho=
+github.com/BurntSushi/toml v1.5.0/go.mod h1:ukJfTF/6rtPPRCnwkur4qwRxa8vTRFBF0uk2lLoLwho=
-github.com/WJQSERVER-STUDIO/go-utils/logger v1.3.0 h1:rOvutC4zYfvtSGN2CNZrycjtq8dLpfu7ypy7tTEErPY=
+github.com/WJQSERVER-STUDIO/go-utils/copyb v0.0.4 h1:JLtFd00AdFg/TP+dtvIzLkdHwKUGPOAijN1sMtEYoFg=
-github.com/WJQSERVER-STUDIO/go-utils/logger v1.3.0/go.mod h1:oW884JCCPDU6c906LI0uKXndWLiRvjb9LkGYC2cqRO8=
+github.com/WJQSERVER-STUDIO/go-utils/copyb v0.0.4/go.mod h1:FZ6XE+4TKy4MOfX1xWKe6Rwsg0ucYFCdNh1KLvyKTfc=
-github.com/bytedance/sonic v1.12.8 h1:4xYRVRlXIgvSZ4e8iVTlMF5szgpXd4AfvuWgA8I8lgs=
+github.com/WJQSERVER-STUDIO/go-utils/log v0.0.1 h1:gJEQspQPB527Vp2FPcdOrynQEj3YYtrg1ixVSB/JvZM=
-github.com/bytedance/sonic v1.12.8/go.mod h1:uVvFidNmlt9+wa31S1urfwwthTWteBgG0hWuoKAXTx8=
+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=
-github.com/bytedance/sonic/loader v0.2.3 h1:yctD0Q3v2NOGfSWPLPvG2ggA2kV6TS6s4wioyEqssH0=
+github.com/bytedance/sonic/loader v0.2.4 h1:ZWCw4stuXUsn1/+zQDqeE7JKP+QO47tz7QCNan80NzY=
-github.com/bytedance/sonic/loader v0.2.3/go.mod h1:N8A3vUdtUebEY2/VQC0MyhYeKUFosQU6FxH2JmUe6VI=
+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/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/gabriel-vasile/mimetype v1.4.8 h1:FfZ3gj38NjllZIeJAmMhr+qKL8Wu+nOoI3GqacKw1NM=
+github.com/fsnotify/fsnotify v1.8.0 h1:dAwr6QBTBZIkG8roQaJjGof0pp0EeF+tNV7YBP3F/8M=
-github.com/gabriel-vasile/mimetype v1.4.8/go.mod h1:ByKUIKGjh1ODkGM1asKUbQZOLGrPjydw3hYPU2YU9t8=
+github.com/fsnotify/fsnotify v1.8.0/go.mod h1:8jBTzvmWwFyi3Pb8djgCCO5IBqzKJ/Jwo8TRcHyHii0=
-github.com/gin-contrib/sse v1.0.0 h1:y3bT1mUWUxDpW4JLQg/HnTqV4rozuW4tC9eFKTxYI9E=
+github.com/google/go-cmp v0.7.0 h1:wk8382ETsv4JYUZwIsn6YpYiWiBsYLSJiTsyBybVuN8=
-github.com/gin-contrib/sse v1.0.0/go.mod h1:zNuFdwarAygJBht0NTKiSi3jRf6RbqeILZ9Sp6Slhe0=
+github.com/google/go-cmp v0.7.0/go.mod h1:pXiqmnSA92OHEEa9HXL2W4E7lf9JzCmGVUdgjX3N/iU=
-github.com/gin-gonic/gin v1.10.0 h1:nTuyha1TYqgedzytsKYqna+DfLos46nTv2ygFy86HFU=
+github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1 h1:EGx4pi6eqNxGaHF6qqu48+N2wcFQ5qg5FXgOdqsJ5d8=
-github.com/gin-gonic/gin v1.10.0/go.mod h1:4PMNQiOhvDRa013RKVbsiNwoyezlm2rm0uX/T7kzp5Y=
+github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1/go.mod h1:wJfORRmW1u3UXTncJ5qlYoELFm8eSnnEO6hX4iZ3EWY=
-github.com/go-playground/assert/v2 v2.2.0 h1:JvknZsQTYeFEAhQwI4qEt9cyV5ONwRHC+lYKSsYSR8s=
+github.com/hertz-contrib/http2 v0.1.8 h1:kjfCGkUxJZHgfPsnRjx1FLJBG55KvtvSQD214guBQLw=
-github.com/go-playground/assert/v2 v2.2.0/go.mod h1:VDjEfimB/XKnb+ZQfWdccd7VUvScMdVu0Titje2rxJ4=
+github.com/hertz-contrib/http2 v0.1.8/go.mod h1:m42hrl8fiTwE4p8c7JdRUZpkePEthvV89q3elL2GeD0=
-github.com/go-playground/locales v0.14.1 h1:EWaQ/wswjilfKLTECiXz7Rh+3BjFhfDFKv/oXslEjJA=
+github.com/jtolds/gls v4.20.0+incompatible h1:xdiiI2gbIgH/gLH7ADydsJ1uDOEzR8yvV7C0MuV77Wo=
-github.com/go-playground/locales v0.14.1/go.mod h1:hxrqLVvrK65+Rwrd5Fc6F2O76J/NuW9t0sjnWqG1slY=
+github.com/jtolds/gls v4.20.0+incompatible/go.mod h1:QJZ7F/aHp+rZTRtaJ1ow/lLfFfVYBRgL+9YlvaHOwJU=
-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.25.0 h1:5Dh7cjvzR7BRZadnsVOzPhWsrwUr0nmsZJxEAnFLNO8=
-github.com/go-playground/validator/v10 v10.25.0/go.mod h1:GGzBIJMuE98Ic/kJsBXbz1x/7cByt++cQ+YOuDM5wus=
-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.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI=
-github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
-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.9 h1:66ze0taIn2H33fBvCkXuv9BmCwDfafmiIVpKV9kKGuY=
+github.com/klauspost/cpuid/v2 v2.2.10 h1:tBs3QSyvjDyFTq3uoc/9xFpCuOsJQFNPiAhYdw2skhE=
-github.com/klauspost/cpuid/v2 v2.2.9/go.mod h1:rqkxqrZ1EhYM9G+hXH7YdowN5R5RGN6NK4QwQ3WMXF8=
+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/leodido/go-urn v1.4.0 h1:WT9HwE9SGECu3lg4d/dIA+jxlljEa1/ffXKmRjqdmIQ=
+github.com/nyaruka/phonenumbers v1.6.0 h1:r9ax45fFg+YLUs2X4bNXm5RAxWl00hYjFgNlv32vtHk=
-github.com/leodido/go-urn v1.4.0/go.mod h1:bvxc+MVxLKB4z00jd1z+Dvzr47oO32F/QSNjSBOlFxI=
+github.com/nyaruka/phonenumbers v1.6.0/go.mod h1:7gjs+Lchqm49adhAKB5cdcng5ZXgt6x7Jgvi0ZorUtU=
-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/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
-github.com/satomitouka/touka-httpc v0.2.0 h1:JohnKH0T5KuVcouycqSI70oJIhMxY1nlNDhgZRxI73s=
+github.com/satomitouka/touka-httpc v0.3.3 h1:Th0uJ5do3oqqZgdUDtqD1SH11x8TcJmrwHMJQlEIKCg=
-github.com/satomitouka/touka-httpc v0.2.0/go.mod h1:ULB/0Ze0Apm46YKl35Jmj1hW5YLVVeOGqCqn+ijqGPM=
+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/valyala/bytebufferpool v1.0.0 h1:GqA5TC/0021Y/b9FG4Oi9Mr3q7XYx6KllzawFIhcdPw=
-github.com/ugorji/go/codec v1.2.12/go.mod h1:UNopzCgEMSXjBc6AOMqYvWC1ktqTAfzJZUZgYf6w6lg=
+github.com/valyala/bytebufferpool v1.0.0/go.mod h1:6bBcMArwyJ5K/AmCkWv1jt77kVWyCJ6HpOuEn7z0Csc=
-golang.org/x/arch v0.14.0 h1:z9JUEZWr8x4rR0OU6c4/4t6E6jOZ8/QBS2bBYBm4tx4=
+golang.org/x/arch v0.15.0 h1:QtOrQd0bTUnhNVNndMpLHNWrDmYzZ2KDqSrEymqInZw=
-golang.org/x/arch v0.14.0/go.mod h1:FEVrYAQjsQXMVJ1nsMoVVXPZg6p2JE2mx8psSWTDQys=
+golang.org/x/arch v0.15.0/go.mod h1:JmwW7aLIoRUKgaTzhkiEFxvcEiQGyOg9BMonBJUS7EE=
-golang.org/x/crypto v0.33.0 h1:IOBPskki6Lysi0lo9qQvbxiQ+FvsCC/YWOecCHAixus=
+golang.org/x/exp v0.0.0-20250305212735-054e65f0b394 h1:nDVHiLt8aIbd/VzvPWN6kSOPE7+F/fNFDSXLVYkE/Iw=
-golang.org/x/crypto v0.33.0/go.mod h1:bVdXmD7IV/4GdElGPozy6U7lWdRXA4qyRVGJV57uQ5M=
+golang.org/x/exp v0.0.0-20250305212735-054e65f0b394/go.mod h1:sIifuuw/Yco/y6yb6+bDNfyeQ/MdPUy/hKEMYQV17cM=
-golang.org/x/net v0.35.0 h1:T5GQRQb2y08kTAByq9L4/bz8cipCdA8FbRTXewonqY8=
+golang.org/x/net v0.0.0-20221014081412-f15817d10f9b/go.mod h1:YDH+HFinaLZZlnHAfSS6ZXJJ9M9t4Dl22yv3iI2vPwk=
-golang.org/x/net v0.35.0/go.mod h1:EglIi67kWsHKlRzzVMUD93VMSWGFOMSZgxFjparz1Qk=
+golang.org/x/net v0.37.0 h1:1zLorHbz+LYj7MQlSf1+2tPIIgibq2eL5xkrGk6f+2c=
-golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/net v0.37.0/go.mod h1:ivrbrMbzFq5J41QOQh0siUuly180yBYtLp+CKbEaFx8=
-golang.org/x/sys v0.30.0 h1:QjkSwP/36a20jFYWkSue1YwXzLmsV5Gfq7Eiy72C1uc=
+golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sys v0.30.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
+golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/text v0.22.0 h1:bofq7m3/HAFvbF51jz3Q9wLg3jkvSPuiZu/pD1XwgtM=
+golang.org/x/sys v0.0.0-20220728004956-3c1f35247d10/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/text v0.22.0/go.mod h1:YRoo4H8PVmsu+E3Ou7cqLVH8oXWIHVoX0jqUWALQhfY=
+golang.org/x/sys v0.31.0 h1:ioabZlmFYtWhL+TRYpcnNlLwhyxaM9kWTDEmfnprqik=
-golang.org/x/time v0.10.0 h1:3usCWA8tQn0L8+hFJQNgzpWbd89begxN66o1Ojdn5L4=
+golang.org/x/sys v0.31.0/go.mod h1:BJP2sWEmIv4KK5OTEluFJCKSidICx8ciO85XgH3Ak8k=
-golang.org/x/time v0.10.0/go.mod h1:3BpzKBy/shNhVucY/MWOyx10tF3SFh9QdLuxbVysPQM=
+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=
-gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 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=

loggin/loggin.go

@@ -1,34 +0,0 @@
-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)
-	}
-}

main.go

@@ -1,49 +1,61 @@
 package main
 
 import (
+	"context"
 	"embed"
 	"flag"
 	"fmt"
-	"io"
 	"io/fs"
 	"net/http"
+	"os"
 	"time"
 
 	"ghproxy/api"
 	"ghproxy/auth"
 	"ghproxy/config"
-	"ghproxy/loggin"
+	"ghproxy/middleware/loggin"
 	"ghproxy/proxy"
 	"ghproxy/rate"
-	"ghproxy/timing"
 
 	"github.com/WJQSERVER-STUDIO/go-utils/logger"
 
-	"github.com/gin-gonic/gin"
+	"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"
 )
 
 var (
-	cfg        *config.Config
+	cfg         *config.Config
-	router     *gin.Engine
+	r           *server.Hertz
-	configfile = "/data/ghproxy/config/config.toml"
+	configfile  = "/data/ghproxy/config/config.toml"
-	cfgfile    string
+	cfgfile     string
-	version    string
+	version     string
-	dev        string
+	runMode     string
-	runMode    string
+	limiter     *rate.RateLimiter
-	limiter    *rate.RateLimiter
+	iplimiter   *rate.IPRateLimiter
-	iplimiter  *rate.IPRateLimiter
+	showVersion bool // 新增的版本号标志
+	showHelp    bool // 新增的帮助标志
 )
 
 var (
-	//go:embed pages/bootstrap/*
+	//go:embed pages/*
 	pagesFS embed.FS
-	//go:embed pages/nebula/*
+	/*
-	NebulaPagesFS embed.FS
+		//go:embed pages/bootstrap/*
+		BootstrapPagesFS embed.FS
+		//go:embed pages/nebula/*
+		NebulaPagesFS embed.FS
+		//go:embed pages/design/*
+		DesignPagesFS embed.FS
+	*/
 )
 
 var (
 	logw       = logger.Logw
-	LogDump    = logger.LogDump
+	logDump    = logger.LogDump
 	logDebug   = logger.LogDebug
 	logInfo    = logger.LogInfo
 	logWarning = logger.LogWarning
@@ -52,6 +64,38 @@ var (
 
 func readFlag() {
 	flag.StringVar(&cfgfile, "cfg", configfile, "config file path")
+	flag.BoolVar(&showVersion, "v", false, "show version and exit")   // 添加-v标志
+	flag.BoolVar(&showHelp, "h", false, "show help message and exit") // 添加-h标志
+
+	// 捕获未定义的 flag
+	flag.Usage = func() {
+		fmt.Fprintf(os.Stderr, "Usage of %s:\n", os.Args[0])
+		flag.PrintDefaults()
+		fmt.Fprintln(os.Stderr, "\nInvalid flags:")
+
+		// 检查未定义的flags
+		invalidFlags := []string{}
+		for _, arg := range os.Args[1:] {
+			if arg[0] == '-' && arg != "-h" && arg != "-v" { // 检查是否是flag, 排除 -h 和 -v
+				defined := false
+				flag.VisitAll(func(f *flag.Flag) {
+					if "-"+f.Name == arg {
+						defined = true
+					}
+				})
+				if !defined {
+					invalidFlags = append(invalidFlags, arg)
+				}
+			}
+		}
+		for _, flag := range invalidFlags {
+			fmt.Fprintf(os.Stderr, "  %s\n", flag)
+		}
+		if len(invalidFlags) > 0 {
+			os.Exit(2) // 使用非零状态码退出，表示有错误
+		}
+
+	}
 }
 
 func loadConfig() {
@@ -59,8 +103,11 @@ func loadConfig() {
 	cfg, err = config.LoadConfig(cfgfile)
 	if err != nil {
 		fmt.Printf("Failed to load config: %v\n", err)
+		// 如果配置文件加载失败，也显示帮助信息并退出
+		flag.Usage()
+		os.Exit(1)
 	}
-	if cfg.Server.Debug {
+	if cfg != nil && cfg.Server.Debug { // 确保 cfg 不为 nil
 		fmt.Println("Config File Path: ", cfgfile)
 		fmt.Printf("Loaded config: %v\n", cfg)
 	}
@@ -71,10 +118,12 @@ 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)
@@ -86,8 +135,8 @@ func loadlist(cfg *config.Config) {
 	auth.Init(cfg)
 }
 
-func setupApi(cfg *config.Config, router *gin.Engine, version string) {
+func setupApi(cfg *config.Config, r *server.Hertz, version string) {
-	api.InitHandleRouter(cfg, router, version)
+	api.InitHandleRouter(cfg, r, version)
 }
 
 func setupRateLimit(cfg *config.Config) {
@@ -106,99 +155,263 @@ func InitReq(cfg *config.Config) {
 	proxy.InitReq(cfg)
 }
 
+// loadEmbeddedPages 加载嵌入式页面资源
+func loadEmbeddedPages(cfg *config.Config) (fs.FS, error) {
+	var pages fs.FS
+	var err error
+	switch cfg.Pages.Theme {
+	case "bootstrap":
+		pages, err = fs.Sub(pagesFS, "pages/bootstrap")
+	case "nebula":
+		pages, err = fs.Sub(pagesFS, "pages/nebula")
+	case "design":
+		pages, err = fs.Sub(pagesFS, "pages/design")
+	case "metro":
+		pages, err = fs.Sub(pagesFS, "pages/metro")
+	case "classic":
+		pages, err = fs.Sub(pagesFS, "pages/classic")
+	case "mino":
+		pages, err = fs.Sub(pagesFS, "pages/mino")
+	default:
+		pages, err = fs.Sub(pagesFS, "pages/bootstrap") // 默认主题
+		logWarning("Invalid Pages Theme: %s, using default theme 'bootstrap'", cfg.Pages.Theme)
+	}
+
+	if err != nil {
+		return nil, fmt.Errorf("failed to load embedded pages: %w", err)
+	}
+	return pages, nil
+}
+
+// setupPages 设置页面路由
+func setupPages(cfg *config.Config, r *server.Hertz) {
+	switch cfg.Pages.Mode {
+	case "internal":
+		// 加载嵌入式资源
+		pages, 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)
+		})
+
+	case "external":
+		// 设置外部资源路径
+		indexPagePath := fmt.Sprintf("%s/index.html", cfg.Pages.StaticDir)
+		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)
+
+		// 设置外部资源路由
+		r.StaticFile("/", indexPagePath)
+		r.StaticFile("/favicon.ico", faviconPath)
+		r.StaticFile("/script.js", javascriptsPath)
+		r.StaticFile("/style.css", stylesheetsPath)
+		//router.StaticFile("/bootstrap.min.css", bootstrapPath)
+
+	default:
+		// 处理无效的Pages Mode
+		logWarning("Invalid Pages Mode: %s, using default embedded theme", cfg.Pages.Mode)
+
+		// 加载嵌入式资源
+		pages, 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)
+		})
+	}
+}
+
 func init() {
 	readFlag()
 	flag.Parse()
+
+	// 如果设置了 -h，则显示帮助信息并退出
+	if showHelp {
+		flag.Usage()
+		os.Exit(0)
+	}
+
+	// 如果设置了 -v，则显示版本号并退出
+	if showVersion {
+		fmt.Printf("GHProxy Version: %s \n", version)
+		os.Exit(0)
+	}
+
 	loadConfig()
-	setupLogger(cfg)
+	if cfg != nil { // 在setupLogger前添加空值检查
-	InitReq(cfg)
+		setupLogger(cfg)
-	loadlist(cfg)
+		InitReq(cfg)
-	setupRateLimit(cfg)
+		loadlist(cfg)
+		setupRateLimit(cfg)
 
-	if cfg.Server.Debug {
+		if cfg.Server.Debug {
-		dev = "true"
+			runMode = "dev"
-		version = "dev"
+		} else {
-	}
+			runMode = "release"
-	if dev == "true" {
+		}
-		gin.SetMode(gin.DebugMode)
-		runMode = "dev"
-	} else {
-		gin.SetMode(gin.ReleaseMode)
-		runMode = "release"
-	}
 
+		if cfg.Server.Debug {
+			version = "Dev" // 如果是Debug模式，版本设置为"Dev"
+		}
+	}
+}
+
+func main() {
+	// 如果 showVersion 为 true，则在 init 阶段已退出，这里直接返回
+	if showVersion || showHelp {
+		return
+	}
 	logDebug("Run Mode: %s", runMode)
 
-	gin.LoggerWithWriter(io.Discard)
+	// 确保在程序配置加载且非版本显示模式下执行
-	router = gin.New()
+	if cfg == nil {
+		fmt.Println("Config not loaded, exiting.")
+		return // 如果配置未加载，则不继续执行
+	}
 
-	// 添加recovery中间件
+	addr := fmt.Sprintf("%s:%d", cfg.Server.Host, cfg.Server.Port)
-	router.Use(gin.Recovery())
 
+	r := server.New(
+		server.WithHostPorts(addr),
+		server.WithH2C(true),
+	)
+
+	r.AddProtocol("h2", factory.NewServerFactory())
+
+	// 添加Recovery中间件
+	r.Use(recovery.Recovery())
 	// 添加log中间件
-	router.Use(loggin.Middleware())
+	r.Use(loggin.Middleware())
 
-	// 添加计时中间件
+	setupApi(cfg, r, version)
-	router.Use(timing.Middleware())
 
-	//H2C默认值为true，而后遵循cfg.Server.EnableH2C的设置
+	setupPages(cfg, r)
-	if cfg.Server.EnableH2C == "on" {
-		router.UseH2C = true
-	} else if cfg.Server.EnableH2C == "" {
-		router.UseH2C = true
-	} else {
-		router.UseH2C = false
-	}
 
-	setupApi(cfg, router, version)
+	// 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)
+	})
 
-	if cfg.Pages.Enabled {
+	r.GET("/github.com/:username/:repo/archive/*filepath", func(ctx context.Context, c *app.RequestContext) { // Distinct path for archive
-		indexPagePath := fmt.Sprintf("%s/index.html", cfg.Pages.StaticDir)
+		proxy.NoRouteHandler(cfg, limiter, iplimiter)(ctx, c)
-		faviconPath := fmt.Sprintf("%s/favicon.ico", cfg.Pages.StaticDir)
+	})
-		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)
-	} else if !cfg.Pages.Enabled {
-		var pages fs.FS
-		var err error
-		if cfg.Pages.Theme == "bootstrap" {
-			pages, err = fs.Sub(pagesFS, "pages/bootstrap")
-			if err != nil {
-				logError("Failed when processing pages: %s", err)
-			}
-		} else if cfg.Pages.Theme == "nebula" {
-			pages, err = fs.Sub(NebulaPagesFS, "pages/nebula")
-			if err != nil {
-				logError("Failed when processing pages: %s", err)
-			}
-		} else {
-			pages, err = fs.Sub(pagesFS, "pages/bootstrap")
-			if err != nil {
-				logError("Failed when processing pages: %s", err)
-			}
-		}
-		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.NoRoute(func(c *gin.Context) {
+	// 2. GitHub Blob/Raw - Use distinct path segments for type
-		proxy.NoRouteHandler(cfg, limiter, iplimiter, runMode)(c)
+	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)
+	})
+
+	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)
+	})
+
+	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)
+	})
+	r.GET("/github.com/:username/:repo/git-upload-pack", func(ctx context.Context, c *app.RequestContext) {
+		proxy.NoRouteHandler(cfg, limiter, iplimiter)(ctx, 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)
+	})
+
+	// 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)
+	})
+
+	// 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)
+	})
+
+	r.NoRoute(func(ctx context.Context, c *app.RequestContext) {
+		proxy.NoRouteHandler(cfg, limiter, iplimiter)(ctx, 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")
-}
 
-func main() {
+	r.Spin()
-	err := router.Run(fmt.Sprintf("%s:%d", cfg.Server.Host, cfg.Server.Port))
-	if err != nil {
-		logError("Failed to start server: %v\n", err)
-	}
 	defer logger.Close()
 	fmt.Println("Program Exit")
 }

middleware/loggin/loggin.go

@@ -0,0 +1,37 @@
+package loggin
+
+import (
+	"context"
+	"time"
+
+	"github.com/WJQSERVER-STUDIO/go-utils/logger"
+	"github.com/cloudwego/hertz/pkg/app"
+)
+
+var (
+	logw       = logger.Logw
+	logDump    = logger.LogDump
+	logDebug   = logger.LogDebug
+	logInfo    = logger.LogInfo
+	logWarning = logger.LogWarning
+	logError   = logger.LogError
+)
+
+// 日志中间件
+func Middleware() app.HandlerFunc {
+	return func(ctx context.Context, c *app.RequestContext) {
+		startTime := time.Now() // 请求开始处理前记录当前时间作为开始时间
+
+		c.Next(ctx) //  调用 Next() 执行后续的 Handler
+
+		endTime := time.Now()                   // 请求处理完成后记录当前时间作为结束时间
+		timingResults := endTime.Sub(startTime) // 计算时间差，得到请求处理耗时 (Duration 类型)
+
+		// 记录日志 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)
+	}
+}

pages/bootstrap/index.html

@@ -1,103 +0,0 @@
-<!DOCTYPE html>
-<html lang="zh">
-
-<head>
-    <meta charset="UTF-8">
-    <meta name="viewport" content="width=device-width, initial-scale=1.0">
-    <title>Github文件加速</title>
-    <link href="https://cdn.jsdelivr.net/npm/bootstrap@5.3.0/dist/css/bootstrap.min.css" rel="stylesheet">
-    <link rel="preconnect" href="https://fonts.googleapis.com">
-    <link rel="preconnect" href="https://fonts.gstatic.com" crossorigin>
-    <link href="style.css" rel="stylesheet">
-</head>
-
-<body>
-    <div class="container py-4 py-md-5">
-        <main>
-            <div class="card mb-4">
-                <div class="card-body">
-                    <h1 class="text-center mb-4">Github文件加速</h1>
-                    <p class="lead text-center mb-4">为访问Github文件进行加速</p>
-                    <form id="github-form">
-                        <div class="mb-3">
-                            <input type="text" class="form-control form-control-lg" id="githubLinkInput"
-                                placeholder="请键入需要代理的 Github 链接">
-                        </div>
-                        <button type="submit" class="btn btn-primary btn-lg w-100">获取文件链接</button>
-                    </form>
-                    <div id="output" class="mt-3 bg-light p-3 rounded position-relative" style="display: none;">
-                        <pre id="formattedLinkOutput" class="mb-0"></pre>
-                        <button id="copyButton"
-                            class="btn btn-outline-secondary btn-sm position-absolute top-0 end-0 m-2" title="复制链接">
-                            <svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="currentColor"
-                                class="bi bi-clipboard" viewBox="0 0 16 16">
-                                <path
-                                    d="M4 1.5H3a2 2 0 0 0-2 2V14a2 2 0 0 0 2 2h10a2 2 0 0 0 2-2V3.5a2 2 0 0 0-2-2h-1v1h1a1 1 0 0 1 1 1V14a1 1 0 0 1-1 1H3a1 1 0 0 1-1-1V3.5a1 1 0 0 1 1-1h1v-1z" />
-                                <path
-                                    d="M9.5 1a.5.5 0 0 1 .5.5v1a.5.5 0 0 1-.5.5h-3a.5.5 0 0 1-.5-.5v-1a.5.5 0 0 1 .5-.5h3zm-3-1A1.5 1.5 0 0 0 5 1.5v1A1.5 1.5 0 0 0 6.5 4h3A1.5 1.5 0 0 0 11 2.5v-1A1.5 1.5 0 0 0 9.5 0h-3z" />
-                            </svg>
-                        </button>
-                        <button id="openButton"
-                            class="btn btn-outline-secondary btn-sm position-absolute top-0 end-0 m-2 me-5"
-                            title="在新标签页中打开">
-                            <svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="currentColor"
-                                class="bi bi-box-arrow-up-right" viewBox="0 0 16 16">
-                                <path fill-rule="evenodd"
-                                    d="M8.636 3.5a.5.5 0 0 0-.5-.5H1.5A1.5 1.5 0 0 0 0 4.5v10A1.5 1.5 0 0 0 1.5 16h10a1.5 1.5 0 0 0 1.5-1.5V7.864a.5.5 0 0 0-1 0V14.5a.5.5 0 0 1-.5.5h-10a.5.5 0 0 1-.5-.5v-10a.5.5 0 0 1 .5-.5h6.636a.5.5 0 0 0 .5-.5z" />
-                                <path fill-rule="evenodd"
-                                    d="M16 .5a.5.5 0 0 0-.5-.5h-5a.5.5 0 0 0 0 1h3.793L6.146 9.146a.5.5 0 1 0 .708.708L15 1.707V5.5a.5.5 0 0 0 1 0v-5z" />
-                            </svg>
-                        </button>
-                    </div>
-                    <p class="text-muted small mt-3 mb-0">GitHub 链接带不带协议头均可，支持 release、archive 以及文件，转换后链接均可使用。</p>
-                </div>
-            </div>
-            <div class="row">
-                <div class="col-md-4 mb-3">
-                    <div class="card h-100">
-                        <div class="card-body">
-                            <h5 class="card-title">文件大小限制</h5>
-                            <p class="card-text" id="sizeLimitDisplay">...</p>
-                        </div>
-                    </div>
-                </div>
-                <div class="col-md-4 mb-3">
-                    <div class="card h-100">
-                        <div class="card-body">
-                            <h5 class="card-title">白名单状态</h5>
-                            <p class="card-text" id="whiteListStatus">...</p>
-                        </div>
-                    </div>
-                </div>
-                <div class="col-md-4 mb-3">
-                    <div class="card h-100">
-                        <div class="card-body">
-                            <h5 class="card-title">黑名单状态</h5>
-                            <p class="card-text" id="blackListStatus">...</p>
-                        </div>
-                    </div>
-                </div>
-            </div>
-        </main>
-        <footer class="text-center mt-4">
-            <p class="text-muted">
-                Copyright &copy; 2024-2025 WJQSERVER-STUDIO<br>
-                <a href="https://github.com/WJQSERVER-STUDIO/ghproxy" class="text-decoration-none">GitHub 仓库</a> |
-                <a href="https://t.me/ghproxy_go" class="text-decoration-none">Telegram 交流群</a>
-            </p>
-        </footer>
-    </div>
-
-    <div class="toast-container position-fixed top-0 end-0 p-3">
-        <div id="toast" class="toast" role="alert" aria-live="assertive" aria-atomic="true">
-            <div class="toast-body"></div>
-        </div>
-    </div>
-
-    <div id="versionBadge" class="version-badge"></div>
-
-    <script src="https://cdn.jsdelivr.net/npm/bootstrap@5.3.0/dist/js/bootstrap.bundle.min.js"></script>
-    <script src="script.js"></script>
-</body>
-
-</html>

pages/bootstrap/script.js

@@ -1,84 +0,0 @@
-const githubForm = document.getElementById('github-form');
-const githubLinkInput = document.getElementById('githubLinkInput');
-const formattedLinkOutput = document.getElementById('formattedLinkOutput');
-const output = document.getElementById('output');
-const copyButton = document.getElementById('copyButton');
-const openButton = document.getElementById('openButton');
-const toast = new bootstrap.Toast(document.getElementById('toast'));
-
-function showToast(message) {
-    const toastBody = document.querySelector('.toast-body');
-    toastBody.textContent = message;
-    toast.show();
-}
-
-function formatGithubLink(githubLink) {
-    const currentHost = window.location.host;
-    let formattedLink = "";
-
-    if (githubLink.startsWith("https://github.com/") || githubLink.startsWith("http://github.com/")) {
-        formattedLink = window.location.protocol + "//" + currentHost + "/github.com" + githubLink.substring(githubLink.indexOf("/", 8));
-    } else if (githubLink.startsWith("github.com/")) {
-        formattedLink = window.location.protocol + "//" + currentHost + "/" + githubLink;
-    } else if (githubLink.startsWith("https://raw.githubusercontent.com/") || githubLink.startsWith("http://raw.githubusercontent.com/")) {
-        formattedLink = window.location.protocol + "//" + currentHost + githubLink.substring(githubLink.indexOf("/", 7));
-    } else if (githubLink.startsWith("raw.githubusercontent.com/")) {
-        formattedLink = window.location.protocol + "//" + currentHost + "/" + githubLink;
-    } else if (githubLink.startsWith("https://gist.githubusercontent.com/") || githubLink.startsWith("http://gist.githubusercontent.com/")) {
-        formattedLink = window.location.protocol + "//" + currentHost + "/gist.github.com" + githubLink.substring(githubLink.indexOf("/", 18));
-    } else if (githubLink.startsWith("gist.githubusercontent.com/")) {
-        formattedLink = window.location.protocol + "//" + currentHost + "/" + githubLink;
-    } else {
-        showToast('请输入有效的GitHub链接');
-        return null;
-    }
-
-    return formattedLink;
-}
-
-githubForm.addEventListener('submit', function (e) {
-    e.preventDefault();
-    const formattedLink = formatGithubLink(githubLinkInput.value);
-    if (formattedLink) {
-        formattedLinkOutput.textContent = formattedLink;
-        output.style.display = 'block';
-    }
-});
-
-copyButton.addEventListener('click', function () {
-    navigator.clipboard.writeText(formattedLinkOutput.textContent).then(() => {
-        showToast('链接已复制到剪贴板');
-    });
-});
-
-openButton.addEventListener('click', function () {
-    window.open(formattedLinkOutput.textContent, '_blank');
-});
-
-function fetchAPI() {
-    fetch('/api/size_limit')
-        .then(response => response.json())
-        .then(data => {
-            document.getElementById('sizeLimitDisplay').textContent = `${data.MaxResponseBodySize} MB`;
-        });
-
-    fetch('/api/whitelist/status')
-        .then(response => response.json())
-        .then(data => {
-            document.getElementById('whiteListStatus').textContent = data.Whitelist ? '已开启' : '已关闭';
-        });
-
-    fetch('/api/blacklist/status')
-        .then(response => response.json())
-        .then(data => {
-            document.getElementById('blackListStatus').textContent = data.Blacklist ? '已开启' : '已关闭';
-        });
-
-    fetch('/api/version')
-        .then(response => response.json())
-        .then(data => {
-            document.getElementById('versionBadge').textContent = data.Version;
-        });
-}
-
-document.addEventListener('DOMContentLoaded', fetchAPI);

pages/bootstrap/style.css

@@ -1,259 +0,0 @@
-        /* 通用样式 */
-        :root {
-            --primary-color: #007aff;
-            /* 主要按钮颜色 */
-            --secondary-color: #34c759;
-            /* 次要按钮颜色 */
-            --background-color: #f9f9f9;
-            /* 亮色模式背景 */
-            --card-background: #ffffff;
-            /* 卡片背景 */
-            --text-color: #333333;
-            /* 亮色模式文本颜色 */
-            --border-color: #e0e0e0;
-            /* 边框颜色 */
-            --input-background: #ffffff;
-            /* 输入框背景 */
-            --input-border: #d1d1d6;
-            /* 输入框边框 */
-            --pre-background: #f1f3f4;
-            /* 代码块背景 */
-            --pre-text-color: #333333;
-            /* 代码块文本颜色 */
-            --version-badge-hover: #39c5bb;
-            /* 说明文字颜色 */
-            --muted-text-color: #6c757d;
-        }
-
-        body {
-            background-color: var(--background-color);
-            color: var(--text-color);
-            font-family: sans-serif;
-            line-height: 1.8;
-            font-size: 15px;
-            margin: 0;
-            padding: 0;
-        }
-
-        h1,
-        h2,
-        h3,
-        h4,
-        h5,
-        h6 {
-            color: var(--text-color);
-            font-weight: 800;
-            letter-spacing: 0.5px;
-            margin: 1rem 0;
-        }
-
-        p,
-        span,
-        a,
-        li {
-            color: var(--text-color);
-            margin-bottom: 1rem;
-        }
-
-        a {
-            text-decoration: none;
-            color: var(--primary-color);
-        }
-
-        a:hover {
-            color: #0056b3;
-        }
-
-        .card {
-            background-color: var(--card-background);
-            border: 1px solid var(--border-color);
-            border-radius: 8px;
-            padding: 16px;
-            margin: 16px 0;
-            box-shadow: 0 2px 8px rgba(0, 0, 0, 0.1);
-            transition: transform 0.2s, box-shadow 0.2s;
-        }
-
-        .card:hover {
-            box-shadow: 0 4px 20px rgba(0, 0, 0, 0.15);
-            transform: translateY(-4px);
-        }
-
-        .btn-outline-secondary {
-            border-radius: 50%;
-            padding: 6px;
-            transition: #e9e9e9 0.3s ease-in-out, color 0.3s ease-in-out;
-        }
-
-        .btn-outline-secondary:hover {
-            background-color: var(--primary-color);
-            color: white;
-        }
-
-        .form-control {
-            background-color: var(--input-background);
-            border: 1px solid var(--input-border);
-            color: var(--text-color);
-            padding: 10px;
-            border-radius: 4px;
-            font-size: 14px;
-            outline: none;
-            transition: border-color 0.2s, box-shadow 0.2s;
-        }
-
-        .form-control:focus {
-            border-color: var(--primary-color);
-            box-shadow: 0 0 0 3px rgba(10, 132, 255, 0.3);
-        }
-
-        .text-muted {
-            color: var(--muted-text-color) !important;
-        }
-
-        .bg-light {
-            background-color: var(--card-background) !important;
-        }
-
-        pre {
-            background-color: var(--pre-background);
-            color: var(--pre-text-color);
-            padding: 16px;
-            border-radius: 8px;
-            overflow-x: auto;
-            font-size: 14px;
-            line-height: 1.6;
-        }
-
-        .version-badge {
-            position: fixed;
-            bottom: 20px;
-            right: 20px;
-            background-color: var(--secondary-color);
-            color: white;
-            padding: 6px 12px;
-            border-radius: 20px;
-            font-size: 0.8rem;
-            box-shadow: 0 2px 10px rgba(0, 0, 0, 0.1);
-            transition: background-color 0.3s ease-in-out;
-        }
-
-        .version-badge:hover {
-            background-color: var(--version-badge-hover);
-        }
-
-        footer {
-            padding: 16px;
-            text-align: center;
-            color: var(--text-color);
-            font-size: 0.9rem;
-            background-color: var(--card-background);
-        }
-
-        footer a {
-            color: var(--primary-color);
-        }
-
-        footer a:hover {
-            color: #0056b3;
-        }
-
-        /* 暗色模式 */
-        @media (prefers-color-scheme: dark) {
-            :root {
-                --background-color: #121212;
-                /* 深灰色背景 */
-                --card-background: #1e1e1e;
-                /* 卡片背景稍浅 */
-                --text-color: #ffffff;
-                /* 纯白文本 */
-                --primary-color: #0a84ff;
-                /* 按钮蓝色 */
-                --secondary-color: #30d158;
-                /* 次要按钮绿色 */
-                --border-color: #3a3a3a;
-                /* 边框颜色 */
-                --input-background: #2c2c2c;
-                /* 输入框背景 */
-                --input-border: #4a4a4a;
-                /* 输入框边框 */
-                --pre-background: #3b3636;
-                /* 代码块背景 */
-                --pre-text-color: #ffffff;
-                /* 代码块文本颜色 */
-                --version-badge-hover: #39c5bc9a;
-                /* 说明文字颜色 */
-                --muted-text-color: #a0a0a0;
-            }
-
-            body {
-                background-color: var(--background-color);
-                color: var(--text-color);
-            }
-
-            h1,
-            h2,
-            h3,
-            h4,
-            h5,
-            h6,
-            p,
-            span,
-            a,
-            li {
-                color: var(--text-color);
-            }
-
-            .card {
-                background-color: var(--card-background);
-                color: var(--text-color);
-                border: 1px solid var(--border-color);
-            }
-
-            .btn-outline-secondary {
-                border-radius: 50%;
-                padding: 6px;
-                transition: background-color 0.3s ease-in-out, color 0.3s ease-in-out;
-            }
-
-            .btn-outline-secondary:hover {
-                background-color: var(--primary-color);
-                color: white;
-            }
-
-            .toast {
-                background-color: var(--card-background);
-                color: var(--text-color);
-                border: 1px solid var(--border-color);
-                border-radius: 8px;
-                box-shadow: 0 2px 8px rgba(0, 0, 0, 0.1);
-            }
-
-            .toast-body {
-                padding: 12px;
-            }
-
-
-            .form-control {
-                background-color: var(--input-background);
-                border: 1px solid var(--input-border);
-                color: var(--text-color);
-            }
-
-            .bg-light {
-                background-color: var(--card-background) !important;
-            }
-
-            pre {
-                background-color: var(--pre-background);
-                color: var(--pre-text-color);
-            }
-
-            footer {
-                background-color: var(--card-background);
-                color: var(--text-color);
-            }
-
-            footer a {
-                color: var(--primary-color);
-            }
-        }

pages/nebula/index.html

@@ -1,168 +0,0 @@
-<!DOCTYPE html>
-<html lang="zh" data-bs-theme="auto">
-
-<head>
-    <meta charset="UTF-8">
-    <meta name="viewport" content="width=device-width, initial-scale=1.0">
-    <title>GitHub加速服务</title>
-    <link href="https://cdn.jsdelivr.net/npm/bootstrap@5.3.0/dist/css/bootstrap.min.css" rel="stylesheet">
-    <link href="style.css" rel="stylesheet">
-</head>
-
-<body>
-    <div class="container py-4 py-lg-5">
-        <header class="text-center mb-5">
-            <h1 class="display-5 fw-bold mb-3">GitHub加速服务</h1>
-            <p class="lead text-muted">高速稳定的 GitHub 资源访问解决方案</p>
-        </header>
-        <div class="main-card p-4 mb-4">
-            <form id="mainForm" class="mb-4">
-                <div class="mb-3">
-                    <label for="inputUrl" class="form-label fw-semibold">GitHub 链接</label>
-                    <input type="url" class="form-control form-control-lg" id="inputUrl" placeholder="输入 GitHub 文件/仓库链接"
-                        required>
-                </div>
-                <button type="submit" class="btn btn-primary btn-lg w-100 py-2">
-                    🚀 生成加速链接
-                </button>
-            </form>
-
-            <!-- 结果输出 -->
-            <div id="output" class="mt-4" hidden>
-                <div class="code-block">
-                    <code id="outputLink" class="d-block text-break"></code>
-                </div>
-                <div class="d-flex gap-2 mt-3">
-                    <button id="copyBtn" class="btn btn-outline-secondary">
-                        ⎘ 复制链接
-                    </button>
-                    <button id="openBtn" class="btn btn-primary">
-                        ↗ 立即打开
-                    </button>
-                </div>
-            </div>
-        </div>
-        <div class="row g-3 mb-4">
-            <div class="col-md-4">
-                <div class="main-card p-3">
-                    <div class="d-flex justify-content-between align-items-center">
-                        <div>
-                            <h6 class="mb-0">文件大小限制</h6>
-                            <small class="text-muted">最大支持文件尺寸</small>
-                        </div>
-                        <span id="sizeLimit" class="status-badge bg-primary">...</span>
-                    </div>
-                </div>
-            </div>
-            <div class="col-md-4">
-                <div class="main-card p-3">
-                    <div class="d-flex justify-content-between align-items-center">
-                        <div>
-                            <h6 class="mb-0">白名单状态</h6>
-                            <small class="text-muted">访问控制列表</small>
-                        </div>
-                        <span id="whitelistStatus" class="status-badge bg-success">...</span>
-                    </div>
-                </div>
-            </div>
-            <div class="col-md-4">
-                <div class="main-card p-3">
-                    <div class="d-flex justify-content-between align-items-center">
-                        <div>
-                            <h6 class="mb-0">黑名单状态</h6>
-                            <small class="text-muted">屏蔽列表状态</small>
-                        </div>
-                        <span id="blacklistStatus" class="status-badge bg-danger">...</span>
-                    </div>
-                </div>
-            </div>
-        </div>
-        <div class="main-card p-4">
-            <h2 class="h4 fw-bold mb-4">📚 详细使用指南</h2>
-
-            <div class="guide-section">
-                <h3 class="h5 fw-semibold mb-3">支持的工具</h3>
-                <ul class="list-unstyled">
-                    <li class="mb-2">✅ 支持域名：github.com</li>
-                    <li class="mb-2">✅ 支持域名：raw.githubusercontent.com</li>
-                    <li class="mb-2">✅ 支持域名：gist.githubusercontent.com</li>
-                    <li class="mb-2">✅ 支持HTTPS Git Clone</li>
-                    <li class="text-muted">❌ 不支持 SSH Git Clone</li>
-                </ul>
-            </div>
-            <div class="guide-section">
-                <h3 class="h5 fw-semibold mb-3">基础用法示例</h3>
-                <div class="command-example">
-                    <h4 class="h6 fw-medium mb-2">Git 克隆</h4>
-                    <code
-                        class="d-block mb-3">git clone <span class="protocol">https</span>://<span class="host">example.com</span>/https://github.com/user/project.git</code>
-                    <h4 class="h6 fw-medium mb-2">私有仓库克隆</h4>
-                    <code
-                        class="d-block">git clone <span class="protocol">https</span>://user:your_token@<span class="host">example.com</span>/https://github.com/user/project.git</code>
-                </div>
-                <div class="command-example">
-                    <h4 class="h6 fw-medium mb-2">文件下载</h4>
-                    <code
-                        class="d-block mb-3">wget <span class="protocol">https</span>://<span class="host">example.com</span>/https://raw.githubusercontent.com/user/project/main/README.md</code>
-                    <h4 class="h6 fw-medium mb-2">版本发布</h4>
-                    <code
-                        class="d-block">curl -LO <span class="protocol">https</span>://<span class="host">example.com</span>/https://github.com/user/project/releases/download/v1.0.0/project_1.0.0.amd64.tar.gz</code>
-                </div>
-            </div>
-            <div class="guide-section">
-                <h3 class="h5 fw-semibold mb-3">支持的文件类型</h3>
-                <div class="row g-3">
-                    <div class="col-md-6">
-                        <div class="main-card p-3">
-                            <h4 class="h6 fw-medium mb-2">原始文件</h4>
-                            <code
-                                class="d-block text-muted fs-sm">https://raw.githubusercontent.com/user/repo/main/file.txt</code>
-                        </div>
-                    </div>
-                    <div class="col-md-6">
-                        <div class="main-card p-3">
-                            <h4 class="h6 fw-medium mb-2">分支源码</h4>
-                            <code class="d-block text-muted fs-sm">https://github.com/user/repo/archive/main.zip</code>
-                        </div>
-                    </div>
-                    <div class="col-md-6">
-                        <div class="main-card p-3">
-                            <h4 class="h6 fw-medium mb-2">版本发布</h4>
-                            <code
-                                class="d-block text-muted fs-sm">https://github.com/user/repo/releases/download/v1.0.0/app.zip</code>
-                        </div>
-                    </div>
-                    <div class="col-md-6">
-                        <div class="main-card p-3">
-                            <h4 class="h6 fw-medium mb-2">Gist 文件</h4>
-                            <code
-                                class="d-block text-muted fs-sm">https://gist.githubusercontent.com/user/gist_id/raw/file.txt</code>
-                        </div>
-                    </div>
-                    <div class="col-md-6">
-                        <div class="main-card p-3">
-                            <h4 class="h6 fw-medium mb-2">HTTPS Git Clone</h4>
-                            <code class="d-block text-muted fs-sm">git clone https://github.com/user/repo.git</code>
-                        </div>
-                    </div>
-                </div>
-            </div>
-        </div>
-        <footer class="text-center mt-5 text-muted">
-            <p class="mb-0 small" id="version">v </p>
-            <p class="mb-0 small">Copyright © 2024 - <span id="currentYear"></span> WJQSERVER-STUDIO<br>
-                <a href="https://github.com/WJQSERVER-STUDIO/ghproxy" class="text-decoration-none">GitHub 仓库</a> |
-                <a href="https://t.me/ghproxy_go" class="text-decoration-none">Telegram 交流群</a>
-            </p>
-        </footer>
-    </div>
-    <div class="toast-container position-fixed bottom-0 end-0 p-3">
-        <div id="liveToast" class="toast" role="alert" aria-live="assertive" aria-atomic="true">
-            <div class="toast-body"></div>
-        </div>
-    </div>
-    <script src="https://cdn.jsdelivr.net/npm/bootstrap@5.3.0/dist/js/bootstrap.bundle.min.js"></script>
-    <script src="script.js"></script>
-</body>
-
-</html>

pages/nebula/script.js

@@ -1,131 +0,0 @@
-(() => {
-    'use strict';
-
-    // 初始化基础配置
-    const currentYear = new Date().getFullYear();
-    document.getElementById('currentYear').textContent = currentYear;
-    const toast = new bootstrap.Toast('#liveToast');
-
-    // DOM 元素
-    const form = document.getElementById('mainForm');
-    const input = document.getElementById('inputUrl');
-    const output = document.getElementById('output');
-    const outputLink = document.getElementById('outputLink');
-
-    // 获取当前域名
-    const CURRENT_PROTOCOL = window.location.protocol.replace(':', '');
-    const CURRENT_HOST = window.location.host;
-    // 替换协议部分
-    document.querySelectorAll('code .protocol').forEach(span => {
-        span.textContent = CURRENT_PROTOCOL;
-    });
-    // 替换域名部分
-    document.querySelectorAll('code .host').forEach(span => {
-        span.textContent = CURRENT_HOST;
-    });
-
-    // URL 转换规则
-    const URL_RULES = [
-        {
-            regex: /^(?:https?:\/\/)?(?:www\.)?(github\.com\/.*)/i,
-            build: path => `${location.protocol}//${location.host}/${path}`
-        },
-        {
-            regex: /^(?:https?:\/\/)?(raw\.githubusercontent\.com\/.*)/i,
-            build: path => `${location.protocol}//${location.host}/${path}`
-        },
-        {
-            regex: /^(?:https?:\/\/)?(gist\.(?:githubusercontent|github)\.com\/.*)/i,
-            build: path => `${location.protocol}//${location.host}/${path}`
-        }
-    ];
-
-    // 核心功能：链接转换
-    function transformGitHubURL(url) {
-        const cleanURL = url.trim().replace(/^https?:\/\//i, '');
-        for (const rule of URL_RULES) {
-            const match = cleanURL.match(rule.regex);
-            if (match) return rule.build(match[1]);
-        }
-        return null;
-    }
-
-    // 事件处理
-    form.addEventListener('submit', e => {
-        e.preventDefault();
-
-        if (!input.checkValidity()) {
-            input.classList.add('is-invalid');
-            showToast('⚠️ 请输入有效的 GitHub 链接');
-            return;
-        }
-
-        const result = transformGitHubURL(input.value);
-        if (!result) {
-            showToast('❌ 不支持的链接格式');
-            return;
-        }
-
-        outputLink.textContent = result;
-        output.hidden = false;
-        window.scrollTo({ top: output.offsetTop - 100, behavior: 'smooth' });
-    });
-
-    document.getElementById('copyBtn').addEventListener('click', async () => {
-        try {
-            await navigator.clipboard.writeText(outputLink.textContent);
-            showToast('✅ 链接已复制');
-        } catch {
-            showToast('❌ 复制失败');
-        }
-    });
-
-    document.getElementById('openBtn').addEventListener('click', () => {
-        window.open(outputLink.textContent, '_blank', 'noopener,noreferrer');
-    });
-
-    // 服务状态监控
-    async function loadServiceStatus() {
-        try {
-            const [size, whitelist, blacklist, version] = await Promise.all([
-                fetchJSON('/api/size_limit'),
-                fetchJSON('/api/whitelist/status'),
-                fetchJSON('/api/blacklist/status'),
-                fetchJSON('/api/version')
-            ]);
-
-            updateStatus('sizeLimit', `${size.MaxResponseBodySize}MB`);
-            updateStatus('whitelistStatus', whitelist.Whitelist ? '已开启' : '已关闭');
-            updateStatus('blacklistStatus', blacklist.Blacklist ? '已开启' : '已关闭');
-            updateStatus('version', `Version ${version.Version}`);
-        } catch {
-            showToast('⚠️ 服务状态获取失败');
-        }
-    }
-
-    async function fetchJSON(url) {
-        const response = await fetch(url);
-        if (!response.ok) throw new Error('API Error');
-        return response.json();
-    }
-
-    function updateStatus(elementId, text) {
-        const element = document.getElementById(elementId);
-        if (element) element.textContent = text;
-    }
-
-    // 工具函数
-    function showToast(message) {
-        const toastBody = document.querySelector('.toast-body');
-        toastBody.textContent = message;
-        toast.show();
-    }
-
-    // 初始化
-    input.addEventListener('input', () => {
-        input.classList.remove('is-invalid');
-        if (output.hidden === false) output.hidden = true;
-    });
-
-    loadServiceStatus();
-})();

pages/nebula/style.css

@@ -1,157 +0,0 @@
-:root {
-    --primary: #007aff;
-    --secondary: #007aff;
-    --background: #f9f9f9;
-    --card-bg: #ffffff;
-    --text: #333333;
-    --border: #d1d1d6;
-    --muted: #64748b;
-    --success: #00a83ed2;
-    --danger: #ce0000dd;
-}
-
-@media (prefers-color-scheme: dark) {
-    :root {
-        --background: #121212;
-        --card-bg: #1e1e1e;
-        --text: #ffffff;
-        --border: #334155;
-        --muted: #94a3b8;
-    }
-
-    .form-control::placeholder {
-        color: var(--muted);
-    }
-
-    .text-muted {
-        color: var(--muted) !important;
-    }
-
-    .btn-outline-secondary {
-        color: var(--muted);
-        border-color: var(--border);
-    }
-
-    .status-badge {
-        color: var(--text) !important;
-    }
-
-    .code-block {
-        background: rgba(255, 255, 255, 0.05);
-    }
-
-    .command-example {
-        background: rgba(255, 255, 255, 0.03);
-    }
-
-    .btn-primary {
-        --bs-btn-bg: var(--primary);
-        --bs-btn-border-color: var(--primary);
-        --bs-btn-hover-bg: var(--secondary);
-        --bs-btn-hover-border-color: var(--secondary);
-    }
-
-    .form-control {
-        background-color: rgba(255, 255, 255, 0.05);
-        border-color: var(--border);
-        color: var(--text);
-    }
-
-    a {
-        color: var(--secondary);
-    }
-}
-
-body {
-    background: var(--background);
-    color: var(--text);
-    font-family: 'Inter', system-ui, sans-serif;
-    line-height: 1.6;
-}
-
-.main-card {
-    background: var(--card-bg);
-    border: 1px solid var(--border);
-    border-radius: 12px;
-    box-shadow: 0 1px 3px rgba(0, 0, 0, 0.05);
-    transition: transform 0.2s, box-shadow 0.2s;
-}
-
-.main-card:hover {
-    transform: translateY(-2px);
-    box-shadow: 0 10px 15px rgba(0, 0, 0, 0.1);
-}
-
-.code-block {
-    background: rgba(37, 99, 235, 0.05);
-    border-left: 3px solid var(--primary);
-    border-radius: 6px;
-    padding: 1rem;
-    position: relative;
-    overflow-x: auto;
-}
-
-.status-badge {
-    padding: 6px 12px;
-    border-radius: 20px;
-    font-size: 0.9rem;
-    font-weight: 500;
-}
-
-.guide-section {
-    border-left: 3px solid var(--primary);
-    padding-left: 1rem;
-    margin: 2rem 0;
-}
-
-.command-example {
-    position: relative;
-    padding: 1.25rem;
-    background: rgba(37, 99, 235, 0.03);
-    border-radius: 8px;
-    margin: 1rem 0;
-}
-
-.command-example::before {
-    content: "➜";
-    position: absolute;
-    left: -1.5rem;
-    color: var(--muted);
-}
-
-.toast {
-    position: fixed;
-    top: 1%;
-    right: 1%;
-    background-color: var(--card-background);
-    color: var(--text-color);
-    border: 1px solid var(--border-color);
-    border-radius: 8px;
-    box-shadow: 0 2px 8px rgba(0, 0, 0, 0.1);
-}
-
-.toast-body {
-    padding: 12px;
-}
-
-#version {
-    text-align: center;
-    font-size: 13px;
-    line-height: 26px;
-    color: #747474;
-}
-
-.bg-primary {
-    --bs-bg-opacity: 1;
-    background-color: #2c82de !important;
-}
-
-.bg-success {
-    --bs-bg-opacity: 1;
-    background-color: #2c82de !important;
-}
-
-.bg-danger {
-    --bs-bg-opacity: 1;
-    background-color: #2c82de !important;
-}

proxy/authpass.go

@@ -4,22 +4,22 @@ import (
 	"ghproxy/config"
 	"net/http"
 
-	"github.com/gin-gonic/gin"
+	"github.com/cloudwego/hertz/pkg/app"
 )
 
-func AuthPassThrough(c *gin.Context, cfg *config.Config, req *http.Request) {
+func AuthPassThrough(c *app.RequestContext, 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.Request.Method, c.Request.URL.String(), c.Request.Header.Get("User-Agent"), c.Request.Proto, 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)
 			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.Request.Method, c.Request.URL.String(), c.Request.Header.Get("User-Agent"), c.Request.Proto)
+					logWarning("%s %s %s %s %s Auth-Error: Conflict Auth Method", c.ClientIP(), c.Method(), string(c.Path()), c.UserAgent(), c.Request.Header.GetProtocol())
 					// 500 Internal Server Error
-					c.JSON(http.StatusInternalServerError, gin.H{"error": "Conflict Auth Method"})
+					c.JSON(http.StatusInternalServerError, map[string]string{"error": "Conflict Auth Method"})
 					return
 				}
 			case "header":
@@ -27,9 +27,9 @@ func AuthPassThrough(c *gin.Context, cfg *config.Config, req *http.Request) {
 					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.Request.Method, c.Request.URL.String(), c.Request.Header.Get("User-Agent"), c.Request.Proto)
+				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())
 				// 500 Internal Server Error
-				c.JSON(http.StatusInternalServerError, gin.H{"error": "Invalid Auth Method / Auth Method is not be set"})
+				c.JSON(http.StatusInternalServerError, map[string]string{"error": "Invalid Auth Method / Auth Method is not be set"})
 				return
 			}
 		}

proxy/chunkreq.go

@@ -2,16 +2,19 @@ package proxy
 
 import (
 	"bytes"
+	"context"
 	"fmt"
 	"ghproxy/config"
 	"io"
 	"net/http"
 	"strconv"
 
-	"github.com/gin-gonic/gin"
+	"github.com/WJQSERVER-STUDIO/go-utils/copyb"
+	"github.com/cloudwego/hertz/pkg/app"
+	hresp "github.com/cloudwego/hertz/pkg/protocol/http1/resp"
 )
 
-func ChunkedProxyRequest(c *gin.Context, u string, cfg *config.Config, mode string, runMode string) {
+func ChunkedProxyRequest(ctx context.Context, c *app.RequestContext, u string, cfg *config.Config, matcher string) {
 	method := c.Request.Method
 
 	// 发送HEAD请求, 预获取Content-Length
@@ -22,6 +25,7 @@ func ChunkedProxyRequest(c *gin.Context, u string, cfg *config.Config, mode stri
 	}
 	setRequestHeaders(c, headReq)
 	removeWSHeader(headReq) // 删除Conection Upgrade头, 避免与HTTP/2冲突(检查是否存在Upgrade头)
+	reWriteEncodeHeader(headReq)
 	AuthPassThrough(c, cfg, headReq)
 
 	headResp, err := client.Do(headReq)
@@ -42,27 +46,24 @@ func ChunkedProxyRequest(c *gin.Context, u string, cfg *config.Config, mode stri
 		size, err := strconv.Atoi(contentLength)
 		if err == nil && size > sizelimit {
 			finalURL := headResp.Request.URL.String()
-			c.Redirect(http.StatusMovedPermanently, finalURL)
+			c.Redirect(http.StatusMovedPermanently, []byte(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)
+			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)
 			return
 		}
 	}
 
-	body, err := readRequestBody(c)
+	body := c.Request.Body()
-	if err != nil {
-		HandleError(c, err.Error())
-		return
-	}
 
 	bodyReader := bytes.NewBuffer(body)
 
-	req, err := client.NewRequest(method, u, bodyReader)
+	req, err := client.NewRequest(string(method()), u, bodyReader)
 	if err != nil {
 		HandleError(c, fmt.Sprintf("Failed to create request: %v", err))
 		return
 	}
 	setRequestHeaders(c, req)
 	removeWSHeader(req) // 删除Conection Upgrade头, 避免与HTTP/2冲突(检查是否存在Upgrade头)
+	reWriteEncodeHeader(req)
 	AuthPassThrough(c, cfg, req)
 
 	resp, err := client.Do(req)
@@ -83,8 +84,8 @@ func ChunkedProxyRequest(c *gin.Context, u string, cfg *config.Config, mode stri
 		size, err := strconv.Atoi(contentLength)
 		if err == nil && size > sizelimit {
 			finalURL := resp.Request.URL.String()
-			c.Redirect(http.StatusMovedPermanently, finalURL)
+			c.Redirect(http.StatusMovedPermanently, []byte(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)
+			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)
 			return
 		}
 	}
@@ -105,23 +106,48 @@ func ChunkedProxyRequest(c *gin.Context, u string, cfg *config.Config, mode stri
 		resp.Header.Del(header)
 	}
 
-	if cfg.CORS.Enabled {
+	switch cfg.Server.Cors {
+	case "*":
 		c.Header("Access-Control-Allow-Origin", "*")
-	} else {
+	case "":
+		c.Header("Access-Control-Allow-Origin", "*")
+	case "nil":
 		c.Header("Access-Control-Allow-Origin", "")
+	default:
+		c.Header("Access-Control-Allow-Origin", cfg.Server.Cors)
 	}
 
 	c.Status(resp.StatusCode)
+	c.Response.HijackWriter(hresp.NewChunkedBodyWriter(&c.Response, c.GetWriter()))
 
-	// 使用固定32KB缓冲池
+	if MatcherShell(u) && matchString(matcher, matchedMatchers) && cfg.Shell.Editor {
-	buffer := BufferPool.Get().([]byte)
+		// 判断body是不是gzip
-	defer BufferPool.Put(buffer)
+		var compress string
+		if resp.Header.Get("Content-Encoding") == "gzip" {
+			compress = "gzip"
+		}
 
-	_, err = io.CopyBuffer(c.Writer, resp.Body, buffer)
+		logInfo("Is Shell: %s %s %s %s %s", c.ClientIP(), method, u, c.Request.Header.Get("User-Agent"), c.Request.Header.GetProtocol())
-	if err != nil {
+		c.Header("Content-Length", "")
-		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
+		//err := ProcessLinksAndWriteChunked(resp.Body, compress, string(c.Request.Host()), cfg, c)
+		_, err := processLinks(resp.Body, c.Response.BodyWriter(), compress, string(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)
+			return
+		} else {
+			c.Flush() // 确保刷入
+		}
 	} else {
-		c.Writer.Flush() // 确保刷入
+		//err = hwriter.Writer(resp.Body, c)
+		//writer := c.Response.BodyWriter()
+		_, err := copyb.Copy(c.Response.BodyWriter(), 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)
+			return
+		} else {
+			c.Flush() // 确保刷入
+		}
 	}
 }

proxy/error.go

@@ -0,0 +1,24 @@
+package proxy
+
+import (
+	"fmt"
+	"net/http"
+
+	"github.com/WJQSERVER-STUDIO/go-utils/logger"
+	"github.com/cloudwego/hertz/pkg/app"
+)
+
+// 日志模块
+var (
+	logw       = logger.Logw
+	logDump    = logger.LogDump
+	logDebug   = logger.LogDebug
+	logInfo    = logger.LogInfo
+	logWarning = logger.LogWarning
+	logError   = logger.LogError
+)
+
+func HandleError(c *app.RequestContext, message string) {
+	c.String(http.StatusInternalServerError, fmt.Sprintf("server error %v", message))
+	logError(message)
+}

proxy/gitreq.go

@@ -2,74 +2,74 @@ package proxy
 
 import (
 	"bytes"
+	"context"
 	"fmt"
 	"ghproxy/config"
 	"io"
 	"net/http"
 	"strconv"
 
-	"github.com/gin-gonic/gin"
+	"github.com/WJQSERVER-STUDIO/go-utils/copyb"
+	"github.com/cloudwego/hertz/pkg/app"
 )
 
-func GitReq(c *gin.Context, u string, cfg *config.Config, mode string, runMode string) {
+func GitReq(ctx context.Context, c *app.RequestContext, u string, cfg *config.Config, mode string) {
-	method := c.Request.Method
+	method := string(c.Request.Method())
-	logInfo("%s %s %s %s %s", c.ClientIP(), method, u, c.Request.Header.Get("User-Agent"), c.Request.Proto)
 
-	// 发送HEAD请求, 预获取Content-Length
+	logDump("Url Before FMT:%s", u)
-	headReq, err := client.NewRequest("HEAD", u, nil)
+	if cfg.GitClone.Mode == "cache" {
-	if err != nil {
+		userPath, repoPath, remainingPath, queryParams, err := extractParts(u)
-		HandleError(c, fmt.Sprintf("Failed to create request: %v", err))
+		if err != nil {
-		return
+			HandleError(c, fmt.Sprintf("Failed to extract parts from URL: %v", err))
-	}
-	setRequestHeaders(c, headReq)
-	AuthPassThrough(c, cfg, headReq)
-
-	headResp, err := client.Do(headReq)
-	if err != nil {
-		HandleError(c, fmt.Sprintf("Failed to send request: %v", err))
-		return
-	}
-
-	// defer headResp.Body.Close()
-	defer func(Body io.ReadCloser) {
-		if err := Body.Close(); err != nil {
-			logError("Failed to close response body: %v", err)
-		}
-	}(headResp.Body)
-
-	contentLength := headResp.Header.Get("Content-Length")
-	sizelimit := cfg.Server.SizeLimit * 1024 * 1024
-	if contentLength != "" {
-		size, err := strconv.Atoi(contentLength)
-		if err == nil && size > sizelimit {
-			finalURL := headResp.Request.URL.String()
-			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
 		}
+		// 构建新url
+		u = cfg.GitClone.SmartGitAddr + userPath + repoPath + remainingPath + "?" + queryParams.Encode()
+		logDump("New Url After FMT:%s", u)
 	}
 
-	body, err := readRequestBody(c)
+	var (
-	if err != nil {
+		resp *http.Response
-		HandleError(c, err.Error())
+		err  error
-		return
+	)
-	}
+
+	body := c.Request.Body()
 
 	bodyReader := bytes.NewBuffer(body)
-
 	// 创建请求
-	req, err := client.NewRequest(method, u, bodyReader)
-	if err != nil {
-		HandleError(c, fmt.Sprintf("Failed to create request: %v", err))
-		return
-	}
-	setRequestHeaders(c, req)
-	AuthPassThrough(c, cfg, req)
 
-	resp, err := client.Do(req)
+	if cfg.GitClone.Mode == "cache" {
-	if err != nil {
+		req, err := gitclient.NewRequest(method, u, bodyReader)
-		HandleError(c, fmt.Sprintf("Failed to send request: %v", err))
+		if err != nil {
-		return
+			HandleError(c, fmt.Sprintf("Failed to create request: %v", err))
+			return
+		}
+		setRequestHeaders(c, req)
+		removeWSHeader(req)
+		reWriteEncodeHeader(req)
+		AuthPassThrough(c, cfg, req)
+
+		resp, err = gitclient.Do(req)
+		if err != nil {
+			HandleError(c, fmt.Sprintf("Failed to send request: %v", err))
+			return
+		}
+	} else {
+		req, err := client.NewRequest(method, u, bodyReader)
+		if err != nil {
+			HandleError(c, fmt.Sprintf("Failed to create request: %v", err))
+			return
+		}
+		setRequestHeaders(c, req)
+		removeWSHeader(req)
+		reWriteEncodeHeader(req)
+		AuthPassThrough(c, cfg, req)
+
+		resp, err = client.Do(req)
+		if err != nil {
+			HandleError(c, fmt.Sprintf("Failed to send request: %v", err))
+			return
+		}
 	}
 	//defer resp.Body.Close()
 	defer func(Body io.ReadCloser) {
@@ -78,13 +78,14 @@ func GitReq(c *gin.Context, u string, cfg *config.Config, mode string, runMode s
 		}
 	}(resp.Body)
 
-	contentLength = resp.Header.Get("Content-Length")
+	contentLength := resp.Header.Get("Content-Length")
 	if contentLength != "" {
 		size, err := strconv.Atoi(contentLength)
+		sizelimit := cfg.Server.SizeLimit * 1024 * 1024
 		if err == nil && size > sizelimit {
-			finalURL := resp.Request.URL.String()
+			finalURL := []byte(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.Request.Method, c.Request.URL.String(), c.Request.Header.Get("User-Agent"), c.Request.Proto, finalURL, size)
+			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)
 			return
 		}
 	}
@@ -105,23 +106,27 @@ func GitReq(c *gin.Context, u string, cfg *config.Config, mode string, runMode s
 		resp.Header.Del(header)
 	}
 
-	if cfg.CORS.Enabled {
+	switch cfg.Server.Cors {
+	case "*":
 		c.Header("Access-Control-Allow-Origin", "*")
-	} else {
+	case "":
+		c.Header("Access-Control-Allow-Origin", "*")
+	case "nil":
 		c.Header("Access-Control-Allow-Origin", "")
+	default:
+		c.Header("Access-Control-Allow-Origin", cfg.Server.Cors)
 	}
 
 	c.Status(resp.StatusCode)
+	//err = hwriter.Writer(resp.Body, c)
+	_, err = copyb.Copy(c.Response.BodyWriter(), resp.Body)
 
-	// 使用固定32KB缓冲池
-	buffer := BufferPool.Get().([]byte)
-	defer BufferPool.Put(buffer)
-
-	_, err = io.CopyBuffer(c.Writer, resp.Body, buffer)
 	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.Proto, 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.Header.GetProtocol(), err)
 		return
 	} else {
-		c.Writer.Flush() // 确保刷入
+
+		c.Flush() // 确保刷入
 	}
+
 }

proxy/handler.go

@@ -1,6 +1,8 @@
 package proxy
 
 import (
+	"context"
+	"errors"
 	"fmt"
 	"ghproxy/auth"
 	"ghproxy/config"
@@ -9,11 +11,13 @@ import (
 	"regexp"
 	"strings"
 
-	"github.com/gin-gonic/gin"
+	"github.com/cloudwego/hertz/pkg/app"
 )
 
-func NoRouteHandler(cfg *config.Config, limiter *rate.RateLimiter, iplimiter *rate.IPRateLimiter, runMode string) gin.HandlerFunc {
+var re = regexp.MustCompile(`^(http:|https:)?/?/?(.*)`) // 匹配http://或https://开头的路径
-	return func(c *gin.Context) {
+
+func NoRouteHandler(cfg *config.Config, limiter *rate.RateLimiter, iplimiter *rate.IPRateLimiter) app.HandlerFunc {
+	return func(ctx context.Context, c *app.RequestContext) {
 
 		// 限制访问频率
 		if cfg.RateLimit.Enabled {
@@ -31,19 +35,19 @@ func NoRouteHandler(cfg *config.Config, limiter *rate.RateLimiter, iplimiter *ra
 			}
 
 			if !allowed {
-				c.JSON(http.StatusTooManyRequests, gin.H{"error": "Too Many Requests"})
+				c.JSON(http.StatusTooManyRequests, map[string]string{"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)
+				logWarning("%s %s %s %s %s 429-TooManyRequests", c.ClientIP(), c.Method(), c.Request.RequestURI(), c.Request.Header.UserAgent(), c.Request.Header.GetProtocol())
 				return
 			}
 		}
 
-		rawPath := strings.TrimPrefix(c.Request.URL.RequestURI(), "/") // 去掉前缀/
+		rawPath := strings.TrimPrefix(string(c.Request.RequestURI()), "/") // 去掉前缀/
-		re := regexp.MustCompile(`^(http:|https:)?/?/?(.*)`)           // 匹配http://或https://开头的路径
+		matches := re.FindStringSubmatch(rawPath)                          // 匹配路径
-		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.Request.Method, rawPath, c.Request.Header.Get("User-Agent"), c.Request.Proto)
+			errMsg := fmt.Sprintf("%s %s %s %s %s Invalid URL", c.ClientIP(), c.Method(), rawPath, c.Request.Header.UserAgent(), c.Request.Header.GetProtocol())
 			logWarning(errMsg)
 			c.String(http.StatusForbidden, "Invalid URL Format. Path: %s", rawPath)
 			return
@@ -52,21 +56,33 @@ func NoRouteHandler(cfg *config.Config, limiter *rate.RateLimiter, iplimiter *ra
 		// 制作url
 		rawPath = "https://" + matches[2]
 
-		username, repo := MatchUserRepo(rawPath, cfg, c, matches) // 匹配用户名和仓库名
+		user, repo, matcher, err := Matcher(rawPath, cfg)
+		if err != nil {
+			if errors.Is(err, ErrInvalidURL) {
+				c.String(http.StatusForbidden, "Invalid URL Format. Path: %s", rawPath)
+				logWarning(err.Error())
+				return
+			}
+			if errors.Is(err, ErrAuthHeaderUnavailable) {
+				c.String(http.StatusForbidden, "AuthHeader Unavailable")
+				logWarning(err.Error())
+				return
+			}
+		}
+		username := user
 
-		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)
+		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.Request.Method, rawPath, c.Request.Header.Get("User-Agent"), c.Request.Proto, full Header
+		// 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.Request.Method, rawPath, c.Request.Header.Get("User-Agent"), c.Request.Proto, c.Request.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())
 		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, gin.H{"error": errMsg})
+				c.JSON(http.StatusForbidden, map[string]string{"error": errMsg})
-				logWarning(logErrMsg)
+				logWarning("%s %s %s %s %s Whitelist Blocked repo: %s", c.ClientIP(), c.Method(), rawPath, c.Request.Header.UserAgent(), c.Request.Header.GetProtocol(), repouser)
 				return
 			}
 		}
@@ -75,53 +91,38 @@ 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, gin.H{"error": errMsg})
+				c.JSON(http.StatusForbidden, map[string]string{"error": errMsg})
-				logWarning(logErrMsg)
+				logWarning("%s %s %s %s %s Blacklist Blocked repo: %s", c.ClientIP(), c.Method(), rawPath, c.Request.Header.UserAgent(), c.Request.Header.GetProtocol(), repouser)
 				return
 			}
 		}
 
-		matches = CheckURL(rawPath, c)
-		if matches == nil {
-			c.AbortWithStatus(http.StatusNotFound)
-			logWarning("%s %s %s %s %s 404-NOMATCH", c.ClientIP(), c.Request.Method, rawPath, c.Request.Header.Get("User-Agent"), c.Request.Proto)
-			return
-		}
-
 		// 若匹配api.github.com/repos/用户名/仓库名/路径, 则检查是否开启HeaderAuth
-		if exps[5].MatchString(rawPath) {
-			if cfg.Auth.AuthMethod != "header" || !cfg.Auth.Enabled {
-				c.JSON(http.StatusForbidden, gin.H{"error": "HeaderAuth is not enabled."})
-				logError("%s %s %s %s %s HeaderAuth-Error: HeaderAuth is not enabled.", c.ClientIP(), c.Request.Method, rawPath, c.Request.Header.Get("User-Agent"), c.Request.Proto)
-				return
-			}
-		}
 
 		// 处理blob/raw路径
-		if exps[1].MatchString(rawPath) {
+		if matcher == "blob" {
 			rawPath = strings.Replace(rawPath, "/blob/", "/raw/", 1)
 		}
 
 		// 鉴权
-		authcheck, err := auth.AuthHandler(c, cfg)
+		var authcheck bool
+		authcheck, err = auth.AuthHandler(ctx, c, cfg)
 		if !authcheck {
-			c.AbortWithStatusJSON(401, gin.H{"error": "Unauthorized"})
+			//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)
+			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)
 			return
 		}
 
 		// IP METHOD URL USERAGENT PROTO 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)
+		logDebug("%s %s %s %s %s Matches: %v", c.ClientIP(), c.Method(), rawPath, c.Request.Header.UserAgent(), c.Request.Header.GetProtocol(), matches)
 
-		switch {
+		switch matcher {
-		case exps[0].MatchString(rawPath), exps[1].MatchString(rawPath), exps[3].MatchString(rawPath), exps[4].MatchString(rawPath):
+		case "releases", "blob", "raw", "gist", "api":
-			//ProxyRequest(c, rawPath, cfg, "chrome", runMode)
+			ChunkedProxyRequest(ctx, c, rawPath, cfg, matcher)
-			ChunkedProxyRequest(c, rawPath, cfg, "chrome", runMode) // dev test chunk
+		case "clone":
-		case exps[2].MatchString(rawPath):
+			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.")

proxy/httpc.go

@@ -14,12 +14,17 @@ var BufferSize int = 32 * 1024 // 32KB
 
 var (
 	tr         *http.Transport
+	gittr      *http.Transport
 	BufferPool *sync.Pool
 	client     *httpc.Client
+	gitclient  *httpc.Client
 )
 
 func InitReq(cfg *config.Config) {
 	initHTTPClient(cfg)
+	if cfg.GitClone.Mode == "cache" {
+		initGitHTTPClient(cfg)
+	}
 
 	// 初始化固定大小的缓存池
 	BufferPool = &sync.Pool{
@@ -30,26 +35,18 @@ func InitReq(cfg *config.Config) {
 }
 
 func initHTTPClient(cfg *config.Config) {
-	/*
+	var proTolcols = new(http.Protocols)
-		ctr = &http.Transport{
+	proTolcols.SetHTTP1(true)
-			MaxIdleConns:          100,
+	proTolcols.SetHTTP2(true)
-			MaxConnsPerHost:       60,
+	proTolcols.SetUnencryptedHTTP2(true)
-			IdleConnTimeout:       20 * time.Second,
-			TLSHandshakeTimeout:   10 * time.Second,
-			ExpectContinueTimeout: 1 * time.Second,
-			ResponseHeaderTimeout: 10 * time.Second,
-			DialContext: (&net.Dialer{
-				Timeout:   30 * time.Second,
-				KeepAlive: 30 * time.Second,
-			}).DialContext,
-		}
-	*/
 	if cfg.Httpc.Mode == "auto" {
+
 		tr = &http.Transport{
 			//MaxIdleConns:    160,
 			IdleConnTimeout: 30 * time.Second,
 			WriteBufferSize: 32 * 1024, // 32KB
 			ReadBufferSize:  32 * 1024, // 32KB
+			Protocols:       proTolcols,
 		}
 	} else if cfg.Httpc.Mode == "advanced" {
 		tr = &http.Transport{
@@ -58,6 +55,7 @@ func initHTTPClient(cfg *config.Config) {
 			MaxIdleConnsPerHost: cfg.Httpc.MaxIdleConnsPerHost,
 			WriteBufferSize:     32 * 1024, // 32KB
 			ReadBufferSize:      32 * 1024, // 32KB
+			Protocols:           proTolcols,
 		}
 	} else {
 		// 错误的模式
@@ -86,3 +84,60 @@ func initHTTPClient(cfg *config.Config) {
 		)
 	}
 }
+
+func initGitHTTPClient(cfg *config.Config) {
+
+	var proTolcols = new(http.Protocols)
+	proTolcols.SetHTTP1(true)
+	proTolcols.SetHTTP2(true)
+	proTolcols.SetUnencryptedHTTP2(true)
+	if cfg.GitClone.ForceH2C {
+		proTolcols.SetHTTP1(false)
+		proTolcols.SetHTTP2(false)
+		proTolcols.SetUnencryptedHTTP2(true)
+	}
+	if cfg.Httpc.Mode == "auto" {
+
+		gittr = &http.Transport{
+			//MaxIdleConns:    160,
+			IdleConnTimeout: 30 * time.Second,
+			WriteBufferSize: 32 * 1024, // 32KB
+			ReadBufferSize:  32 * 1024, // 32KB
+			Protocols:       proTolcols,
+		}
+	} else if cfg.Httpc.Mode == "advanced" {
+		gittr = &http.Transport{
+			MaxIdleConns:        cfg.Httpc.MaxIdleConns,
+			MaxConnsPerHost:     cfg.Httpc.MaxConnsPerHost,
+			MaxIdleConnsPerHost: cfg.Httpc.MaxIdleConnsPerHost,
+			WriteBufferSize:     32 * 1024, // 32KB
+			ReadBufferSize:      32 * 1024, // 32KB
+			Protocols:           proTolcols,
+		}
+	} else {
+		// 错误的模式
+		logError("unknown httpc mode: %s", cfg.Httpc.Mode)
+		fmt.Println("unknown httpc mode: ", cfg.Httpc.Mode)
+		logWarning("use Auto to Run HTTP Client")
+		fmt.Println("use Auto to Run HTTP Client")
+		gittr = &http.Transport{
+			//MaxIdleConns:    160,
+			IdleConnTimeout: 30 * time.Second,
+			WriteBufferSize: 32 * 1024, // 32KB
+			ReadBufferSize:  32 * 1024, // 32KB
+		}
+	}
+	if cfg.Outbound.Enabled {
+		initTransport(cfg, gittr)
+	}
+	if cfg.Server.Debug {
+		gitclient = httpc.New(
+			httpc.WithTransport(gittr),
+			httpc.WithDumpLog(),
+		)
+	} else {
+		gitclient = httpc.New(
+			httpc.WithTransport(gittr),
+		)
+	}
+}

proxy/match.go

@@ -0,0 +1,455 @@
+package proxy
+
+import (
+	"bufio"
+	"compress/gzip"
+	"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承载描述, 便于处理
+type MatcherErrors struct {
+	Code int
+	Msg  string
+	Err  error
+}
+
+var (
+	ErrInvalidURL = &MatcherErrors{
+		Code: 403,
+		Msg:  "Invalid URL Format",
+	}
+	ErrAuthHeaderUnavailable = &MatcherErrors{
+		Code: 403,
+		Msg:  "AuthHeader Unavailable",
+	}
+)
+
+func (e *MatcherErrors) Error() string {
+	if e.Err != nil {
+		return fmt.Sprintf("Code: %d, Msg: %s, Err: %s", e.Code, e.Msg, e.Err.Error())
+	}
+	return fmt.Sprintf("Code: %d, Msg: %s", e.Code, e.Msg)
+}
+
+func (e *MatcherErrors) Unwrap() error {
+	return e.Err
+}
+
+func Matcher(rawPath string, cfg *config.Config) (string, string, string, error) {
+	var (
+		user    string
+		repo    string
+		matcher string
+	)
+	// 匹配 "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, "/")
+		}
+		// 预期格式/user/repo/more...
+		// 取出user和repo和最后部分
+		parts := strings.Split(remainingPath, "/")
+		if len(parts) <= 2 {
+			return "", "", "", ErrInvalidURL
+		}
+		user = parts[0]
+		repo = parts[1]
+		// 匹配 "https://github.com"开头的链接
+		if len(parts) >= 3 {
+			switch parts[2] {
+			case "releases", "archive":
+				matcher = "releases"
+			case "blob", "raw":
+				matcher = "blob"
+			case "info", "git-upload-pack":
+				matcher = "clone"
+			default:
+				return "", "", "", ErrInvalidURL
+			}
+		}
+		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://")
+		parts := strings.Split(remainingPath, "/")
+		if len(parts) <= 3 {
+			return "", "", "", ErrInvalidURL
+		}
+		user = parts[1]
+		repo = ""
+		matcher = "gist"
+		return user, repo, matcher, nil
+	}
+	// 匹配 "https://api.github.com/"开头的链接
+	if strings.HasPrefix(rawPath, "https://api.github.com/") {
+		matcher = "api"
+		remainingPath := strings.TrimPrefix(rawPath, "https://api.github.com/")
+
+		parts := strings.Split(remainingPath, "/")
+		if parts[0] == "repos" {
+			user = parts[1]
+			repo = parts[2]
+		}
+		if parts[0] == "users" {
+			user = parts[1]
+		}
+		if !cfg.Auth.ForceAllowApi {
+			if cfg.Auth.AuthMethod != "header" || !cfg.Auth.Enabled {
+				return "", "", "", ErrAuthHeaderUnavailable
+			}
+		}
+		return user, repo, matcher, nil
+	}
+	return "", "", "", ErrInvalidURL
+}
+
+func EditorMatcher(rawPath string, cfg *config.Config) (bool, string, error) {
+	var (
+		matcher string
+	)
+	// 匹配 "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, "/")
+		}
+		return true, "", nil
+	}
+	// 匹配 "https://raw.githubusercontent.com"开头的链接
+	if strings.HasPrefix(rawPath, "https://raw.githubusercontent.com") {
+		return true, matcher, nil
+	}
+	// 匹配 "https://raw.github.com"开头的链接
+	if strings.HasPrefix(rawPath, "https://raw.github.com") {
+		return true, matcher, nil
+	}
+	// 匹配 "https://gist.githubusercontent.com"开头的链接
+	if strings.HasPrefix(rawPath, "https://gist.githubusercontent.com") {
+		return true, matcher, nil
+	}
+	// 匹配 "https://gist.github.com"开头的链接
+	if strings.HasPrefix(rawPath, "https://gist.github.com") {
+		return true, matcher, nil
+	}
+	// 匹配 "https://api.github.com/"开头的链接
+	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
+}
+
+// LinkProcessor 是一个函数类型，用于处理提取到的链接。
+type LinkProcessor func(string) string
+
+// 自定义 URL 修改函数
+func modifyURL(url string, host string, cfg *config.Config) string {
+	// 去除url内的https://或http://
+	matched, _, err := EditorMatcher(url, cfg)
+	if err != nil {
+		logDump("Invalid URL: %s", url)
+		return url
+	}
+	if matched {
+
+		u := strings.TrimPrefix(url, "https://")
+		u = strings.TrimPrefix(url, "http://")
+		logDump("Modified URL: %s", "https://"+host+"/"+u)
+		return "https://" + host + "/" + u
+	}
+	return url
+}
+
+var (
+	matchedMatchers = []string{
+		"blob",
+		"raw",
+		"gist",
+	}
+)
+
+// matchString 检查目标字符串是否在给定的字符串集合中
+func matchString(target string, stringsToMatch []string) bool {
+	matchMap := make(map[string]struct{}, len(stringsToMatch))
+	for _, str := range stringsToMatch {
+		matchMap[str] = struct{}{}
+	}
+	_, exists := matchMap[target]
+	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
+
+	if compress == "gzip" {
+		// 解压gzip
+		gzipReader, err := gzip.NewReader(input)
+		if err != nil {
+			return 0, fmt.Errorf("gzip解压错误: %v", err)
+		}
+		defer gzipReader.Close()
+		reader = bufio.NewReader(gzipReader)
+	} else {
+		reader = bufio.NewReader(input)
+	}
+
+	var writer *bufio.Writer
+	var gzipWriter *gzip.Writer
+
+	// 根据是否gzip确定 writer 的创建
+	if compress == "gzip" {
+		gzipWriter = gzip.NewWriter(output)
+		writer = bufio.NewWriterSize(gzipWriter, 4096) //设置缓冲区大小
+	} else {
+		writer = bufio.NewWriterSize(output, 4096)
+	}
+
+	//确保writer关闭
+	defer func() {
+		var closeErr error // 局部变量，用于保存defer中可能发生的错误
+
+		if gzipWriter != nil {
+			if closeErr = gzipWriter.Close(); closeErr != nil {
+				logError("gzipWriter close failed %v", closeErr)
+				// 如果已经存在错误，则保留。否则，记录此错误。
+				if err == nil {
+					err = closeErr
+				}
+			}
+		}
+		if flushErr := writer.Flush(); flushErr != nil {
+			logError("writer flush failed %v", flushErr)
+			// 如果已经存在错误，则保留。否则，记录此错误。
+			if err == nil {
+				err = flushErr
+			}
+		}
+	}()
+
+	// 使用正则表达式匹配 http 和 https 链接
+	urlPattern := regexp.MustCompile(`https?://[^\s'"]+`)
+	for {
+		line, err := reader.ReadString('\n')
+		if err != nil {
+			if err == io.EOF {
+				break // 文件结束
+			}
+			return written, fmt.Errorf("读取行错误: %v", err) // 传递错误
+		}
+
+		// 替换所有匹配的 URL
+		modifiedLine := urlPattern.ReplaceAllStringFunc(line, func(originalURL string) string {
+			return modifyURL(originalURL, host, cfg)
+		})
+
+		n, werr := writer.WriteString(modifiedLine)
+		written += int64(n) // 更新写入的字节数
+		if werr != nil {
+			return written, fmt.Errorf("写入文件错误: %v", werr) // 传递错误
+		}
+	}
+
+	// 在返回之前，再刷新一次
+	if fErr := writer.Flush(); fErr != nil {
+		return written, fErr
+	}
+
+	return written, nil
+}

proxy/matchrepo.go

@@ -1,34 +0,0 @@
-package proxy
-
-import (
-	"fmt"
-	"ghproxy/config"
-	"net/http"
-	"regexp"
-
-	"github.com/gin-gonic/gin"
-)
-
-// 预定义regex
-var (
-	pathRegex = regexp.MustCompile(`^([^/]+)/([^/]+)/([^/]+)/.*`)                                         // 匹配路径
-	gistRegex = regexp.MustCompile(`^(?:https?://)?gist\.github(?:usercontent|)\.com/([^/]+)/([^/]+)/.*`) // 匹配gist路径
-)
-
-// 提取用户名和仓库名
-func MatchUserRepo(rawPath string, cfg *config.Config, c *gin.Context, matches []string) (string, string) {
-	if gistMatches := gistRegex.FindStringSubmatch(rawPath); len(gistMatches) == 3 {
-		LogDump("%s %s %s %s %s Matched-Username: %s", c.ClientIP(), c.Request.Method, rawPath, c.Request.Header.Get("User-Agent"), c.Request.Proto, gistMatches[1])
-		return gistMatches[1], ""
-	}
-	// 定义路径
-	if pathMatches := pathRegex.FindStringSubmatch(matches[2]); len(pathMatches) >= 4 {
-		return pathMatches[2], pathMatches[3]
-	}
-
-	// 返回错误信息
-	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 path; expected username/repo, Path: %s", rawPath)
-	return "", ""
-}

proxy/proxy.go

@@ -1,95 +0,0 @@
-package proxy
-
-import (
-	"fmt"
-	"io"
-	"net/http"
-	"regexp"
-
-	"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
-)
-
-var exps = []*regexp.Regexp{
-	regexp.MustCompile(`^(?:https?://)?github\.com/([^/]+)/([^/]+)/(?:releases|archive)/.*`),
-	regexp.MustCompile(`^(?:https?://)?github\.com/([^/]+)/([^/]+)/(?:blob|raw)/.*`),
-	regexp.MustCompile(`^(?:https?://)?github\.com/([^/]+)/([^/]+)/(?:info|git-).*`),
-	regexp.MustCompile(`^(?:https?://)?raw\.github(?:usercontent|)\.com/([^/]+)/([^/]+)/.+?/.+`),
-	regexp.MustCompile(`^(?:https?://)?gist\.github(?:usercontent|)\.com/([^/]+)/.+?/.+`),
-	regexp.MustCompile(`^(?:https?://)?api\.github\.com/repos/([^/]+)/([^/]+)/.*`),
-}
-
-// 读取请求体
-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 SendRequest(c *gin.Context, req *req.Request, method, url string) (*req.Response, error) {
-	switch method {
-	case "GET":
-		return req.Get(url)
-	case "POST":
-		return req.Post(url)
-	case "PUT":
-		return req.Put(url)
-	case "DELETE":
-		return req.Delete(url)
-	default:
-		// IP METHOD URL USERAGENT PROTO UNSUPPORTED-METHOD
-		errmsg := fmt.Sprintf("%s %s %s %s %s Unsupported method", c.ClientIP(), method, url, c.Request.Header.Get("User-Agent"), c.Request.Proto)
-		logWarning(errmsg)
-		return nil, fmt.Errorf(errmsg)
-	}
-}
-*/
-
-func HandleError(c *gin.Context, message string) {
-	c.String(http.StatusInternalServerError, fmt.Sprintf("server error %v", message))
-	logError(message)
-}
-
-func CheckURL(u string, c *gin.Context) []string {
-	for _, exp := range exps {
-		if matches := exp.FindStringSubmatch(u); matches != nil {
-			return matches[1:]
-		}
-	}
-	errMsg := fmt.Sprintf("%s %s %s %s %s Invalid URL", c.ClientIP(), c.Request.Method, u, c.Request.Header.Get("User-Agent"), c.Request.Proto)
-	logError(errMsg)
-	return nil
-}
-
-/*
-// 处理响应大小
-func HandleResponseSize(resp *http.Response, cfg *config.Config, c *gin.Context) error {
-	contentLength := resp.Header.Get("Content-Length")
-	sizelimit := cfg.Server.SizeLimit * 1024 * 1024
-	if contentLength != "" {
-		size, err := strconv.Atoi(contentLength)
-		if err == nil && size > sizelimit {
-			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.Request.Method, c.Request.URL.String(), c.Request.Header.Get("User-Agent"), c.Request.Proto, finalURL, size)
-			return fmt.Errorf("Path: %s size limit exceeded: %d", finalURL, size)
-		}
-	}
-	return nil
-}
-*/

proxy/proxyreq.go

@@ -1,79 +0,0 @@
-package proxy
-
-/*
-func ProxyRequest(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)
-
-	client := createHTTPClient(mode)
-	if runMode == "dev" {
-		client.DevMode()
-	}
-
-	// 发送HEAD请求, 预获取Content-Length
-	headReq := client.R()
-	setRequestHeaders(c, headReq)
-	AuthPassThrough(c, cfg, headReq)
-
-	headResp, err := headReq.Head(u)
-	if err != nil {
-		HandleError(c, fmt.Sprintf("Failed to send request: %v", err))
-		return
-	}
-	defer headResp.Body.Close()
-
-	if err := HandleResponseSize(headResp, cfg, c); err != nil {
-		logWarning("%s %s %s %s %s Response-Size-Error: %v", c.ClientIP(), method, u, c.Request.Header.Get("User-Agent"), c.Request.Proto, err)
-		return
-	}
-
-	body, err := readRequestBody(c)
-	if err != nil {
-		HandleError(c, err.Error())
-		return
-	}
-
-	req := client.R().SetBody(body)
-	setRequestHeaders(c, req)
-	AuthPassThrough(c, cfg, req)
-
-	resp, err := SendRequest(c, req, method, u)
-	if err != nil {
-		HandleError(c, fmt.Sprintf("Failed to send request: %v", err))
-		return
-	}
-	defer resp.Body.Close()
-
-	if err := HandleResponseSize(resp, cfg, c); err != nil {
-		logWarning("%s %s %s %s %s Response-Size-Error: %v", c.ClientIP(), method, u, c.Request.Header.Get("User-Agent"), c.Request.Proto, err)
-		return
-	}
-
-	CopyResponseHeaders(resp, c, cfg)
-	c.Status(resp.StatusCode)
-	if err := copyResponseBody(c, resp.Body); err != nil {
-		logError("%s %s %s %s %s Response-Copy-Error: %v", c.ClientIP(), method, u, c.Request.Header.Get("User-Agent"), c.Request.Proto, err)
-	}
-}
-
-// 复制响应体
-func copyResponseBody(c *gin.Context, respBody io.Reader) error {
-	_, err := io.Copy(c.Writer, respBody)
-	return err
-}
-
-// 判断并选择TLS指纹
-func createHTTPClient(mode string) *req.Client {
-	client := req.C()
-	switch mode {
-	case "chrome":
-		client.SetUserAgent("Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/130.0.0.0 Safari/537.36").
-			SetTLSFingerprintChrome().
-			ImpersonateChrome()
-	case "git":
-		client.SetUserAgent("git/2.33.1")
-	}
-	return client
-}
-
-*/

proxy/reqheader.go

@@ -2,20 +2,46 @@ package proxy
 
 import (
 	"net/http"
+	"strings"
 
-	"github.com/gin-gonic/gin"
+	"github.com/cloudwego/hertz/pkg/app"
 )
 
 // 设置请求头
-func setRequestHeaders(c *gin.Context, req *http.Request) {
+func setRequestHeaders(c *app.RequestContext, req *http.Request) {
-	for key, values := range c.Request.Header {
+	c.Request.Header.VisitAll(func(key, value []byte) {
-		for _, value := range values {
+		req.Header.Set(string(key), string(value))
-			req.Header.Set(key, value)
+	})
-		}
-	}
 }
 
 func removeWSHeader(req *http.Request) {
 	req.Header.Del("Upgrade")
 	req.Header.Del("Connection")
 }
+
+func reWriteEncodeHeader(req *http.Request) {
+	if isGzipAccepted(req.Header) {
+		req.Header.Set("Content-Encoding", "gzip")
+		req.Header.Set("Accept-Encoding", "gzip")
+	} else {
+		req.Header.Del("Content-Encoding")
+		req.Header.Del("Accept-Encoding")
+	}
+
+}
+
+// isGzipAccepted 检查 Accept-Encoding 头部中是否包含 gzip
+func isGzipAccepted(header http.Header) bool {
+	// 获取 Accept-Encoding 的值
+	encodings := header["Accept-Encoding"]
+	for _, encoding := range encodings {
+		// 将 encoding 字符串拆分为多个编码
+		for _, enc := range strings.Split(encoding, ",") {
+			// 去除空格并检查是否为 gzip
+			if strings.TrimSpace(enc) == "gzip" {
+				return true
+			}
+		}
+	}
+	return false
+}

timing/timing.go

@@ -1,86 +0,0 @@
-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
-}