Merge pull request #156 from WJQSERVER-STUDIO/dev

4.2.5
Merge pull request #155 from WJQSERVER-STUDIO/dev
2025-07-31 20:01:31 +08:00 · 2025-07-29 23:45:49 +08:00 · 2025-07-29 23:42:33 +08:00 · 2025-07-27 15:46:42 +08:00 · 2025-07-25 18:23:06 +08:00 · 2025-07-25 16:31:09 +08:00
19 changed files with 188 additions and 577 deletions
--- a/.github/workflows/build-dev.yml
+++ b/.github/workflows/build-dev.yml
@@ -46,7 +46,7 @@ jobs:
        goarch: [amd64, arm64]
    env:
      OUTPUT_BINARY: ghproxy
-      GO_VERSION: 1.25
+      GO_VERSION: 1.24

    steps:
      - uses: actions/checkout@v4
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -47,7 +47,7 @@ jobs:
        goarch: [amd64, arm64]
    env:
      OUTPUT_BINARY: ghproxy
-      GO_VERSION: 1.25
+      GO_VERSION: 1.24

    steps:
      - uses: actions/checkout@v3
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,5 @@
 demo
 demo.toml
-demo.wanf
 *.log
 *.bak
 list.json
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,40 +1,5 @@
 # 更新日志

-4.3.3 - 2025-09-10
---
- CHANGE: 增强对[wanf](https://github.com/WJQSERVER/wanf)的支持
- CHANGE: 更新包括Touka框架在内的各个依赖版本
-
-4.3.2 - 2025-08-20
---
- FIX: 修正`cfg.Pages.StaticDir`为空时的处置
-
-4.3.1 - 2025-08-13
---
- CHANGE: 更新至[Go 1.25](https://tip.golang.org/doc/go1.25)
-
-4.3.0 - 2025-08-11
---
- CHANGE: 为OCI镜像(Docker)代理带来自动library附加功能
- CHANGE(refactor): 改进OCI镜像(Docker)代理路径组成流程
- ADD: 新增[WANF](https://github.com/WJQSERVER/wanf)配置文件格式支持
-
-4.3.0-rc.0 - 2025-08-11
---
- PRE-RELEASE: v4.3.0-rc.0是v4.3.0发布版本,请勿在生产环境中使用;
- CHANGE: 为OCI镜像(Docker)代理带来自动library附加功能
- CHANGE(refactor): 改进OCI镜像(Docker)代理路径组成流程
- ADD: 新增[WANF](https://github.com/WJQSERVER/wanf)配置文件格式支持
-
-4.2.7 - 2025-08-04
---
- CHANGE: 在OCI镜像(docker)代理部分增加特殊处理, 保证可用性 参看[#159](https://github.com/WJQSERVER-STUDIO/ghproxy/issues/159)
- CHANGE: 更新Touka框架, 同步解决部分日志过多问题
-
-4.2.6 - 2025-08-01
---
- CHANGE: 修正匹配器
-
 4.2.5 - 2025-07-31
 ---
 - CHANGE: 进一步完善匹配器, 兼容更多情况
--- a/2
+++ b/2
@@ -1 +1 @@
-4.3.0-rc.0
+4.2.4-rc.0
--- a/2
+++ b/2
@@ -1 +1 @@
-4.3.3
+4.2.5
--- a/api/api.go
+++ b/api/api.go
@@ -3,7 +3,6 @@ package api
 import (
 	"ghproxy/config"
 	"ghproxy/middleware/nocache"
-	"ghproxy/stats"

 	"github.com/infinite-iroha/touka"
 )
@@ -47,17 +46,9 @@ func InitHandleRouter(cfg *config.Config, r *touka.Engine, version string) {
 		apiRouter.GET("/oci_proxy/status", func(c *touka.Context) {
 			ociProxyStatusHandler(cfg, c)
 		})
-		apiRouter.GET("/stats", func(c *touka.Context) {
-			StatsHandler(c)
-		})
 	}
 }

-func StatsHandler(c *touka.Context) {
-	c.SetHeader("Content-Type", "application/json")
-	c.JSON(200, stats.GetStats())
-}
-
 func SizeLimitHandler(cfg *config.Config, c *touka.Context) {
 	sizeLimit := cfg.Server.SizeLimit
 	c.SetHeader("Content-Type", "application/json")
--- a/backend/index.html
+++ b/backend/index.html
@@ -1,28 +0,0 @@
-<!DOCTYPE html>
-<html lang="zh">
-<head>
-    <meta charset="UTF-8">
-    <meta name="viewport" content="width=device-width, initial-scale=1.0">
-    <title>后台统计</title>
-    <link rel="stylesheet" href="/bootstrap.min.css">
-</head>
-<body>
-    <div class="container mt-5">
-        <h1>IP 代理使用情况统计</h1>
-        <table class="table table-striped table-bordered mt-4">
-            <thead>
-                <tr>
-                    <th>IP 地址</th>
-                    <th>调用次数</th>
-                    <th>总流量 (bytes)</th>
-                    <th>最后调用时间</th>
-                </tr>
-            </thead>
-            <tbody id="stats-table-body">
-                <!-- 数据将由 script.js 动态填充 -->
-            </tbody>
-        </table>
-    </div>
-    <script src="script.js"></script>
-</body>
-</html>
--- a/backend/script.js
+++ b/backend/script.js
@@ -1,36 +0,0 @@
-document.addEventListener('DOMContentLoaded', function() {
-    fetch('/api/stats')
-        .then(response => response.json())
-        .then(data => {
-            const tableBody = document.getElementById('stats-table-body');
-            tableBody.innerHTML = ''; // 清空现有内容
-
-            for (const ip in data) {
-                const stats = data[ip];
-                const row = document.createElement('tr');
-
-                const ipCell = document.createElement('td');
-                ipCell.textContent = stats.ip;
-                row.appendChild(ipCell);
-
-                const callCountCell = document.createElement('td');
-                callCountCell.textContent = stats.call_count;
-                row.appendChild(callCountCell);
-
-                const transferredCell = document.createElement('td');
-                transferredCell.textContent = stats.total_transferred;
-                row.appendChild(transferredCell);
-
-                const lastCalledCell = document.createElement('td');
-                lastCalledCell.textContent = new Date(stats.last_called).toLocaleString();
-                row.appendChild(lastCalledCell);
-
-                tableBody.appendChild(row);
-            }
-        })
-        .catch(error => {
-            console.error('获取统计数据时出错:', error);
-            const tableBody = document.getElementById('stats-table-body');
-            tableBody.innerHTML = '<tr><td colspan="4" class="text-center">加载统计数据失败</td></tr>';
-        });
-});
--- a/config/config.go
+++ b/config/config.go
@@ -1,31 +1,25 @@
 package config

 import (
-	"fmt"
 	"os"
-	"path/filepath"
-	"strings"

 	"github.com/BurntSushi/toml"
-
-	"github.com/WJQSERVER/wanf"
 )

-// Config 结构体定义了整个应用程序的配置
 type Config struct {
-	Server    ServerConfig    `toml:"server" wanf:"server"`
-	Httpc     HttpcConfig     `toml:"httpc" wanf:"httpc"`
-	GitClone  GitCloneConfig  `toml:"gitclone" wanf:"gitclone"`
-	Shell     ShellConfig     `toml:"shell" wanf:"shell"`
-	Pages     PagesConfig     `toml:"pages" wanf:"pages"`
-	Log       LogConfig       `toml:"log" wanf:"log"`
-	Auth      AuthConfig      `toml:"auth" wanf:"auth"`
-	Blacklist BlacklistConfig `toml:"blacklist" wanf:"blacklist"`
-	Whitelist WhitelistConfig `toml:"whitelist" wanf:"whitelist"`
-	IPFilter  IPFilterConfig  `toml:"ipFilter" wanf:"ipFilter"`
-	RateLimit RateLimitConfig `toml:"rateLimit" wanf:"rateLimit"`
-	Outbound  OutboundConfig  `toml:"outbound" wanf:"outbound"`
-	Docker    DockerConfig    `toml:"docker" wanf:"docker"`
+	Server    ServerConfig    `toml:"server"`
+	Httpc     HttpcConfig     `toml:"httpc"`
+	GitClone  GitCloneConfig  `toml:"gitclone"`
+	Shell     ShellConfig     `toml:"shell"`
+	Pages     PagesConfig     `toml:"pages"`
+	Log       LogConfig       `toml:"log"`
+	Auth      AuthConfig      `toml:"auth"`
+	Blacklist BlacklistConfig `toml:"blacklist"`
+	Whitelist WhitelistConfig `toml:"whitelist"`
+	IPFilter  IPFilterConfig  `toml:"ipFilter"`
+	RateLimit RateLimitConfig `toml:"rateLimit"`
+	Outbound  OutboundConfig  `toml:"outbound"`
+	Docker    DockerConfig    `toml:"docker"`
 }

 /*
@@ -38,14 +32,13 @@ cors = "*" # "*"/"" -> "*" ; "nil" -> "" ;
 debug = false
 */

-// ServerConfig 定义服务器相关的配置
 type ServerConfig struct {
-	Port      int    `toml:"port" wanf:"port"`
-	Host      string `toml:"host" wanf:"host"`
-	SizeLimit int    `toml:"sizeLimit" wanf:"sizeLimit"`
-	MemLimit  int64  `toml:"memLimit" wanf:"memLimit"`
-	Cors      string `toml:"cors" wanf:"cors"`
-	Debug     bool   `toml:"debug" wanf:"debug"`
+	Port      int    `toml:"port"`
+	Host      string `toml:"host"`
+	SizeLimit int    `toml:"sizeLimit"`
+	MemLimit  int64  `toml:"memLimit"`
+	Cors      string `toml:"cors"`
+	Debug     bool   `toml:"debug"`
 }

 /*
@@ -56,13 +49,12 @@ maxIdleConnsPerHost = 60 # only for advanced mode
 maxConnsPerHost = 0 # only for advanced mode
 useCustomRawHeaders = false
 */
-// HttpcConfig 定义 HTTP 客户端相关的配置
 type HttpcConfig struct {
-	Mode                string `toml:"mode" wanf:"mode"`
-	MaxIdleConns        int    `toml:"maxIdleConns" wanf:"maxIdleConns"`
-	MaxIdleConnsPerHost int    `toml:"maxIdleConnsPerHost" wanf:"maxIdleConnsPerHost"`
-	MaxConnsPerHost     int    `toml:"maxConnsPerHost" wanf:"maxConnsPerHost"`
-	UseCustomRawHeaders bool   `toml:"useCustomRawHeaders" wanf:"useCustomRawHeaders"`
+	Mode                string `toml:"mode"`
+	MaxIdleConns        int    `toml:"maxIdleConns"`
+	MaxIdleConnsPerHost int    `toml:"maxIdleConnsPerHost"`
+	MaxConnsPerHost     int    `toml:"maxConnsPerHost"`
+	UseCustomRawHeaders bool   `toml:"useCustomRawHeaders"`
 }

 /*
@@ -72,12 +64,11 @@ smartGitAddr = "http://127.0.0.1:8080"
 //cacheTimeout = 10
 ForceH2C = true
 */
-// GitCloneConfig 定义 Git 克隆相关的配置
 type GitCloneConfig struct {
-	Mode         string `toml:"mode" wanf:"mode"`
-	SmartGitAddr string `toml:"smartGitAddr" wanf:"smartGitAddr"`
+	Mode         string `toml:"mode"`
+	SmartGitAddr string `toml:"smartGitAddr"`
 	//CacheTimeout int    `toml:"cacheTimeout"`
-	ForceH2C bool `toml:"ForceH2C" wanf:"ForceH2C"`
+	ForceH2C bool `toml:"ForceH2C"`
 }

 /*
@@ -85,10 +76,9 @@ type GitCloneConfig struct {
 editor = true
 rewriteAPI = false
 */
-// ShellConfig 定义 Shell 相关的配置
 type ShellConfig struct {
-	Editor     bool `toml:"editor" wanf:"editor"`
-	RewriteAPI bool `toml:"rewriteAPI" wanf:"rewriteAPI"`
+	Editor     bool `toml:"editor"`
+	RewriteAPI bool `toml:"rewriteAPI"`
 }

 /*
@@ -97,18 +87,16 @@ mode = "internal" # "internal" or "external"
 theme = "bootstrap" # "bootstrap" or "nebula"
 staticDir = "/data/www"
 */
-// PagesConfig 定义静态页面相关的配置
 type PagesConfig struct {
-	Mode      string `toml:"mode" wanf:"mode"`
-	Theme     string `toml:"theme" wanf:"theme"`
-	StaticDir string `toml:"staticDir" wanf:"staticDir"`
+	Mode      string `toml:"mode"`
+	Theme     string `toml:"theme"`
+	StaticDir string `toml:"staticDir"`
 }

-// LogConfig 定义日志相关的配置
 type LogConfig struct {
-	LogFilePath string `toml:"logFilePath" wanf:"logFilePath"`
-	MaxLogSize  int64  `toml:"maxLogSize" wanf:"maxLogSize"`
-	Level       string `toml:"level" wanf:"level"`
+	LogFilePath string `toml:"logFilePath"`
+	MaxLogSize  int64  `toml:"maxLogSize"`
+	Level       string `toml:"level"`
 }

 /*
@@ -121,35 +109,31 @@ passThrough = false
 ForceAllowApi = false
 ForceAllowApiPassList = false
 */
-// AuthConfig 定义认证相关的配置
 type AuthConfig struct {
-	Enabled               bool   `toml:"enabled" wanf:"enabled"`
-	Method                string `toml:"method" wanf:"method"`
-	Key                   string `toml:"key" wanf:"key"`
-	Token                 string `toml:"token" wanf:"token"`
-	PassThrough           bool   `toml:"passThrough" wanf:"passThrough"`
-	ForceAllowApi         bool   `toml:"ForceAllowApi" wanf:"ForceAllowApi"`
-	ForceAllowApiPassList bool   `toml:"ForceAllowApiPassList" wanf:"ForceAllowApiPassList"`
+	Enabled               bool   `toml:"enabled"`
+	Method                string `toml:"method"`
+	Key                   string `toml:"key"`
+	Token                 string `toml:"token"`
+	PassThrough           bool   `toml:"passThrough"`
+	ForceAllowApi         bool   `toml:"ForceAllowApi"`
+	ForceAllowApiPassList bool   `toml:"ForceAllowApiPassList"`
 }

-// BlacklistConfig 定义黑名单相关的配置
 type BlacklistConfig struct {
-	Enabled       bool   `toml:"enabled" wanf:"enabled"`
-	BlacklistFile string `toml:"blacklistFile" wanf:"blacklistFile"`
+	Enabled       bool   `toml:"enabled"`
+	BlacklistFile string `toml:"blacklistFile"`
 }

-// WhitelistConfig 定义白名单相关的配置
 type WhitelistConfig struct {
-	Enabled       bool   `toml:"enabled" wanf:"enabled"`
-	WhitelistFile string `toml:"whitelistFile" wanf:"whitelistFile"`
+	Enabled       bool   `toml:"enabled"`
+	WhitelistFile string `toml:"whitelistFile"`
 }

-// IPFilterConfig 定义 IP 过滤相关的配置
 type IPFilterConfig struct {
-	Enabled         bool   `toml:"enabled" wanf:"enabled"`
-	EnableAllowList bool   `toml:"enableAllowList" wanf:"enableAllowList"`
-	EnableBlockList bool   `toml:"enableBlockList" wanf:"enableBlockList"`
-	IPFilterFile    string `toml:"ipFilterFile" wanf:"ipFilterFile"`
+	Enabled         bool   `toml:"enabled"`
+	EnableAllowList bool   `toml:"enableAllowList"`
+	EnableBlockList bool   `toml:"enableBlockList"`
+	IPFilterFile    string `toml:"ipFilterFile"`
 }

 /*
@@ -166,21 +150,19 @@ burst = 10
 	singleBurst = "10mbps"
 */

-// RateLimitConfig 定义限速相关的配置
 type RateLimitConfig struct {
-	Enabled        bool                 `toml:"enabled" wanf:"enabled"`
-	RatePerMinute  int                  `toml:"ratePerMinute" wanf:"ratePerMinute"`
-	Burst          int                  `toml:"burst" wanf:"burst"`
-	BandwidthLimit BandwidthLimitConfig `toml:"bandwidthLimit" wanf:"bandwidthLimit"`
+	Enabled        bool `toml:"enabled"`
+	RatePerMinute  int  `toml:"ratePerMinute"`
+	Burst          int  `toml:"burst"`
+	BandwidthLimit BandwidthLimitConfig
 }

-// BandwidthLimitConfig 定义带宽限制相关的配置
 type BandwidthLimitConfig struct {
-	Enabled     bool   `toml:"enabled" wanf:"enabled"`
-	TotalLimit  string `toml:"totalLimit" wanf:"totalLimit"`
-	TotalBurst  string `toml:"totalBurst" wanf:"totalBurst"`
-	SingleLimit string `toml:"singleLimit" wanf:"singleLimit"`
-	SingleBurst string `toml:"singleBurst" wanf:"singleBurst"`
+	Enabled     bool   `toml:"enabled"`
+	TotalLimit  string `toml:"totalLimit"`
+	TotalBurst  string `toml:"totalBurst"`
+	SingleLimit string `toml:"singleLimit"`
+	SingleBurst string `toml:"singleBurst"`
 }

 /*
@@ -188,10 +170,9 @@ type BandwidthLimitConfig struct {
 enabled = false
 url = "socks5://127.0.0.1:1080" # "http://127.0.0.1:7890"
 */
-// OutboundConfig 定义出站代理相关的配置
 type OutboundConfig struct {
-	Enabled bool   `toml:"enabled" wanf:"enabled"`
-	Url     string `toml:"url" wanf:"url"`
+	Enabled bool   `toml:"enabled"`
+	Url     string `toml:"url"`
 }

 /*
@@ -203,19 +184,17 @@ auth = false
 user1 = "testpass"
 test = "test123"
 */
-// DockerConfig 定义 Docker 相关的配置
 type DockerConfig struct {
-	Enabled         bool              `toml:"enabled" wanf:"enabled"`
-	Target          string            `toml:"target" wanf:"target"`
-	Auth            bool              `toml:"auth" wanf:"auth"`
-	Credentials     map[string]string `toml:"credentials" wanf:"credentials"`
-	AuthPassThrough bool              `toml:"authPassThrough" wanf:"authPassThrough"`
+	Enabled         bool              `toml:"enabled"`
+	Target          string            `toml:"target"`
+	Auth            bool              `toml:"auth"`
+	Credentials     map[string]string `toml:"credentials"`
+	AuthPassThrough bool              `toml:"authPassThrough"`
 }

-// LoadConfig 从配置文件加载配置
+// LoadConfig 从 TOML 配置文件加载配置
 func LoadConfig(filePath string) (*Config, error) {
-	exist, filePath2read := FileExists(filePath)
-	if !exist {
+	if !FileExists(filePath) {
 		// 楔入配置文件
 		err := DefaultConfig().WriteConfig(filePath)
 		if err != nil {
@@ -223,22 +202,15 @@ func LoadConfig(filePath string) (*Config, error) {
 		}
 		return DefaultConfig(), nil
 	}
-	var config Config
-	ext := filepath.Ext(filePath2read)
-	if ext == ".wanf" {
-		if err := wanf.DecodeFile(filePath2read, &config); err != nil {
-			return nil, err
-		}
-		return &config, nil
-	}

-	if _, err := toml.DecodeFile(filePath2read, &config); err != nil {
+	var config Config
+	if _, err := toml.DecodeFile(filePath, &config); err != nil {
 		return nil, err
 	}
 	return &config, nil
 }

-// WriteConfig 写入配置文件
+// 写入配置文件
 func (c *Config) WriteConfig(filePath string) error {
 	file, err := os.Create(filePath)
 	if err != nil {
@@ -246,54 +218,17 @@ func (c *Config) WriteConfig(filePath string) error {
 	}
 	defer file.Close()

-	ext := filepath.Ext(filePath)
-	if ext == ".wanf" {
-		err := wanf.NewStreamEncoder(file).Encode(c)
-		if err != nil {
-			return err
-		}
-		return nil
-	}
-
 	encoder := toml.NewEncoder(file)
 	return encoder.Encode(c)
 }

-// FileExists 检测文件是否存在
-func FileExists(filename string) (bool, string) {
+// 检测文件是否存在
+func FileExists(filename string) bool {
 	_, err := os.Stat(filename)
-	if err == nil {
-		return true, filename
-	}
-	if os.IsNotExist(err) {
-		// 获取文件名（不包含路径）
-		base := filepath.Base(filename)
-		dir := filepath.Dir(filename)
-
-		// 获取扩展名
-		fileNameBody := strings.TrimSuffix(base, filepath.Ext(base))
-
-		// 重新组合路径, 扩展名改为.wanf, 确认是否存在
-		wanfFilename := filepath.Join(dir, fileNameBody+".wanf")
-
-		_, err = os.Stat(wanfFilename)
-		if err == nil {
-			// .wanf 文件存在
-			fmt.Printf("\n Found .wanf file: %s\n", wanfFilename)
-			return true, wanfFilename
-		} else if os.IsNotExist(err) {
-			// .wanf 文件不存在
-			return false, ""
-		} else {
-			// 其他错误
-			return false, ""
-		}
-	} else {
-		return false, filename
-	}
+	return !os.IsNotExist(err)
 }

-// DefaultConfig 返回默认配置结构体
+// 默认配置结构体
 func DefaultConfig() *Config {
 	return &Config{
 		Server: ServerConfig{
--- a/config/config.toml
+++ b/config/config.toml
@@ -25,10 +25,10 @@ rewriteAPI = false
 [pages]
 mode = "internal" # "internal" or "external"
 theme = "bootstrap" # "bootstrap" or "nebula"
-staticDir = "pages"
+staticDir = "/data/www" 

 [log]
-logFilePath = "ghproxy.log"
+logFilePath = "/data/ghproxy/log/ghproxy.log" 
 maxLogSize = 5 # MB
 level = "info" # debug, info, warn, error, none

@@ -42,18 +42,18 @@ ForceAllowApi = false
 ForceAllowApiPassList = false

 [blacklist]
-blacklistFile = "blacklist.json"
+blacklistFile = "/data/ghproxy/config/blacklist.json"
 enabled = false

 [whitelist]
 enabled = false
-whitelistFile = "whitelist.json"
+whitelistFile = "/data/ghproxy/config/whitelist.json"

 [ipFilter]
 enabled = false
 enableAllowList = false
 enableBlockList = false
-ipFilterFile = "ipfilter.json"
+ipFilterFile = "/data/ghproxy/config/ipfilter.json"

 [rateLimit]
 enabled = false
--- a/go.mod
+++ b/go.mod
@@ -1,26 +1,25 @@
 module ghproxy

-go 1.25.1
+go 1.24.5

 require (
 	github.com/BurntSushi/toml v1.5.0
 	github.com/WJQSERVER-STUDIO/httpc v0.8.2
-	golang.org/x/net v0.44.0
-	golang.org/x/time v0.13.0
+	golang.org/x/net v0.42.0
+	golang.org/x/time v0.12.0
 )

 require (
 	github.com/WJQSERVER-STUDIO/go-utils/iox v0.0.2
 	github.com/WJQSERVER-STUDIO/go-utils/limitreader v0.0.2
-	github.com/WJQSERVER/wanf v0.0.0-20250810023226-e51d9d0737ee
 	github.com/fenthope/bauth v0.0.1
 	github.com/fenthope/ikumi v0.0.2
 	github.com/fenthope/ipfilter v0.0.1
 	github.com/fenthope/reco v0.0.4
 	github.com/fenthope/record v0.0.4
-	github.com/go-json-experiment/json v0.0.0-20250813233538-9b1f9ea2e11b
+	github.com/go-json-experiment/json v0.0.0-20250725192818-e39067aee2d2
 	github.com/hashicorp/golang-lru/v2 v2.0.7
-	github.com/infinite-iroha/touka v0.3.8
+	github.com/infinite-iroha/touka v0.3.4
 	github.com/wjqserver/modembed v0.0.1
 )

--- a/go.sum
+++ b/go.sum
@@ -6,8 +6,6 @@ github.com/WJQSERVER-STUDIO/go-utils/limitreader v0.0.2 h1:8bBkKk6E2Zr+I5szL7gyc
 github.com/WJQSERVER-STUDIO/go-utils/limitreader v0.0.2/go.mod h1:yPX8xuZH+py7eLJwOYj3VVI/4/Yuy5+x8Mhq8qezcPg=
 github.com/WJQSERVER-STUDIO/httpc v0.8.2 h1:PFPLodV0QAfGEP6915J57vIqoKu9cGuuiXG/7C9TNUk=
 github.com/WJQSERVER-STUDIO/httpc v0.8.2/go.mod h1:8WhHVRO+olDFBSvL5PC/bdMkb6U3vRdPJ4p4pnguV5Y=
-github.com/WJQSERVER/wanf v0.0.0-20250810023226-e51d9d0737ee h1:tJ31DNBn6UhWkk8fiikAQWqULODM+yBcGAEar1tzdZc=
-github.com/WJQSERVER/wanf v0.0.0-20250810023226-e51d9d0737ee/go.mod h1:q2Pyg+G+s1acMWxrbI4CwS/Yk76/BzLREEdZ8iFwUNE=
 github.com/fenthope/bauth v0.0.1 h1:+4UIQshGx3mYD4L3f2S4MLZOi5PWU7fU5GK3wsZvwzE=
 github.com/fenthope/bauth v0.0.1/go.mod h1:1fveTpgfR1p+WXQ8MXm9BfBCeNYi55j23jxCOGOvBSA=
 github.com/fenthope/ikumi v0.0.2 h1:5oaSTf/Msp7M2O3o/X20omKWEQbFhX4KV0CVF21oCdk=
@@ -18,17 +16,17 @@ github.com/fenthope/reco v0.0.4 h1:yo2g3aWwdoMpaZWZX4SdZOW7mCK82RQIU/YI8ZUQThM=
 github.com/fenthope/reco v0.0.4/go.mod h1:eMyS8HpdMVdJ/2WJt6Cvt8P1EH9Igzj5lSJrgc+0jeg=
 github.com/fenthope/record v0.0.4 h1:/1JHNCxiXGLL/qCh4LEGaAvhj4CcKsb6siTxjLmjdO4=
 github.com/fenthope/record v0.0.4/go.mod h1:G0a6KCiCDyX2SsC3nfzSN651fJKxH482AyJvzlnvAJU=
-github.com/go-json-experiment/json v0.0.0-20250813233538-9b1f9ea2e11b h1:6Q4zRHXS/YLOl9Ng1b1OOOBWMidAQZR3Gel0UKPC/KU=
-github.com/go-json-experiment/json v0.0.0-20250813233538-9b1f9ea2e11b/go.mod h1:TiCD2a1pcmjd7YnhGH0f/zKNcCD06B029pHhzV23c2M=
+github.com/go-json-experiment/json v0.0.0-20250725192818-e39067aee2d2 h1:iizUGZ9pEquQS5jTGkh4AqeeHCMbfbjeb0zMt0aEFzs=
+github.com/go-json-experiment/json v0.0.0-20250725192818-e39067aee2d2/go.mod h1:TiCD2a1pcmjd7YnhGH0f/zKNcCD06B029pHhzV23c2M=
 github.com/hashicorp/golang-lru/v2 v2.0.7 h1:a+bsQ5rvGLjzHuww6tVxozPZFVghXaHOwFs4luLUK2k=
 github.com/hashicorp/golang-lru/v2 v2.0.7/go.mod h1:QeFd9opnmA6QUJc5vARoKUSoFhyfM2/ZepoAG6RGpeM=
-github.com/infinite-iroha/touka v0.3.8 h1:BK7+hwk5s5SpRFjFKIPe5CzZNzjP36kLHkM/HX6SU38=
-github.com/infinite-iroha/touka v0.3.8/go.mod h1:uwkF1gTrNEgQ4P/Gwtk6WLbERehq3lzB8x1FMedyrfE=
+github.com/infinite-iroha/touka v0.3.4 h1:vYDjfXTkjpTe7tasSVbPeVAPSXzd/wS1T2tkiMx/Wwk=
+github.com/infinite-iroha/touka v0.3.4/go.mod h1:xOKkEKTWYLHIBW6qbL2O6nSAO0RyDLsVXPtJxFYg/YM=
 github.com/valyala/bytebufferpool v1.0.0 h1:GqA5TC/0021Y/b9FG4Oi9Mr3q7XYx6KllzawFIhcdPw=
 github.com/valyala/bytebufferpool v1.0.0/go.mod h1:6bBcMArwyJ5K/AmCkWv1jt77kVWyCJ6HpOuEn7z0Csc=
 github.com/wjqserver/modembed v0.0.1 h1:8ZDz7t9M5DLrUFlYgBUUmrMzxWsZPmHvOazkr/T2jEs=
 github.com/wjqserver/modembed v0.0.1/go.mod h1:sYbQJMAjSBsdYQrUsuHY380XXE1CuRh8g9yyCztTXOQ=
-golang.org/x/net v0.44.0 h1:evd8IRDyfNBMBTTY5XRF1vaZlD+EmWx6x8PkhR04H/I=
-golang.org/x/net v0.44.0/go.mod h1:ECOoLqd5U3Lhyeyo/QDCEVQ4sNgYsqvCZ722XogGieY=
-golang.org/x/time v0.13.0 h1:eUlYslOIt32DgYD6utsuUeHs4d7AsEYLuIAdg7FlYgI=
-golang.org/x/time v0.13.0/go.mod h1:eL/Oa2bBBK0TkX57Fyni+NgnyQQN4LitPmob2Hjnqw4=
+golang.org/x/net v0.42.0 h1:jzkYrhi3YQWD6MLBJcsklgQsoAcw89EcZbJw8Z614hs=
+golang.org/x/net v0.42.0/go.mod h1:FF1RA5d3u7nAYA4z2TkclSCKh68eSXtiFwcWQpPXdt8=
+golang.org/x/time v0.12.0 h1:ScB/8o8olJvc+CQPWrK3fPZNfh7qgwCrY0zJmoEQLSE=
+golang.org/x/time v0.12.0/go.mod h1:CDIdPxbZBQxdj6cxyCIdrNogrJKMJ7pr37NYpMcMDSg=
--- a/main.go
+++ b/main.go
@@ -8,7 +8,6 @@ import (
 	"net/http"
 	"os"
 	"runtime/debug"
-	"strings"
 	"time"

 	"ghproxy/api"
@@ -47,8 +46,6 @@ var (
 var (
 	//go:embed pages/*
 	pagesFS embed.FS
-	//go:embed backend/*
-	backendFS embed.FS
 )

 var (
@@ -236,18 +233,8 @@ func setupPages(cfg *config.Config, r *touka.Engine) {
 		}

 	case "external":
-		if cfg.Pages.StaticDir == "" {
-			logger.Errorf("Pages Mode is 'external' but StaticDir is empty. Using embedded pages instead.")
-			err := setInternalRoute(cfg, r)
-			if err != nil {
-				logger.Errorf("Failed to load embedded pages: %s", err)
-				fmt.Printf("Failed to load embedded pages: %s", err)
-				os.Exit(1)
-			}
-		} else {
-			extPageFS := os.DirFS(cfg.Pages.StaticDir)
-			r.SetUnMatchFS(http.FS(extPageFS))
-		}
+		r.SetUnMatchFS(http.Dir(cfg.Pages.StaticDir))
+
 	default:
 		// 处理无效的Pages Mode
 		logger.Warnf("Invalid Pages Mode: %s, using default embedded theme", cfg.Pages.Mode)
@@ -344,7 +331,6 @@ func main() {
 	}

 	r := touka.Default()
-	var err error
 	r.SetProtocols(&touka.ProtocolsConfig{
 		Http1:           true,
 		Http2_Cleartext: true,
@@ -383,8 +369,8 @@ func main() {
 	}

 	if cfg.IPFilter.Enabled {
-		var ipAllowList, ipBlockList []string
-		ipAllowList, ipBlockList, err = auth.ReadIPFilterList(cfg)
+		var err error
+		ipAllowList, ipBlockList, err := auth.ReadIPFilterList(cfg)
 		if err != nil {
 			fmt.Printf("Failed to read IP filter list: %v\n", err)
 			logger.Errorf("Failed to read IP filter list: %v", err)
@@ -406,43 +392,16 @@ func main() {
 	}
 	setupApi(cfg, r, version)
 	setupPages(cfg, r)
-	setBackendRoute(r)
 	r.SetRedirectTrailingSlash(false)

-	r.GET("/github.com/:user/:repo/releases/*filepath", func(c *touka.Context) {
-		// 规范化路径: 移除前导斜杠, 简化后续处理
-		filepath := c.Param("filepath")
-		if len(filepath) > 0 && filepath[0] == '/' {
-			filepath = filepath[1:]
-		}
+	r.GET("/github.com/:user/:repo/releases/download/*filepath", func(c *touka.Context) {
+		c.Set("matcher", "releases")
+		proxy.RoutingHandler(cfg)(c)
+	})

-		isValidDownload := false
-
-		// 检查两种合法的下载链接格式
-		// 情况 A: "download/..."
-		if strings.HasPrefix(filepath, "download/") {
-			isValidDownload = true
-		} else {
-			// 情况 B: ":tag/download/..."
-			slashIndex := strings.IndexByte(filepath, '/')
-			// 确保 tag 部分存在 (slashIndex > 0)
-			if slashIndex > 0 {
-				pathAfterTag := filepath[slashIndex+1:]
-				if strings.HasPrefix(pathAfterTag, "download/") {
-					isValidDownload = true
-				}
-			}
-		}
-
-		// 根据匹配结果执行最终操作
-		if isValidDownload {
-			c.Set("matcher", "releases")
-			proxy.RoutingHandler(cfg)(c)
-		} else {
-			// 任何不符合下载链接格式的 'releases' 路径都被视为浏览页面并拒绝
-			proxy.ErrorPage(c, proxy.NewErrorWithStatusLookup(400, "unsupported releases page, only download links are allowed"))
-			return
-		}
+	r.GET("/github.com/:user/:repo/releases/:tag/download/*filepath", func(c *touka.Context) {
+		c.Set("matcher", "releases")
+		proxy.RoutingHandler(cfg)(c)
 	})

 	r.GET("/github.com/:user/:repo/archive/*filepath", func(c *touka.Context) {
@@ -488,11 +447,20 @@ func main() {
 		proxy.RoutingHandler(cfg)(c)
 	})

-	r.ANY("/v2/*path",
+	r.GET("/v2/",
 		r.UseIf(cfg.Docker.Auth, func() touka.HandlerFunc {
 			return bauth.BasicAuthForStatic(cfg.Docker.Credentials, "GHProxy Docker Proxy")
 		}),
-		proxy.OciWithImageRouting(cfg),
+		func(c *touka.Context) {
+			emptyJSON := "{}"
+			c.Header("Content-Type", "application/json")
+			c.Header("Content-Length", fmt.Sprint(len(emptyJSON)))
+
+			c.Header("Docker-Distribution-API-Version", "registry/2.0")
+
+			c.Status(200)
+			c.Writer.Write([]byte(emptyJSON))
+		},
 	)

 	r.GET("/v2", func(c *touka.Context) {
@@ -500,6 +468,10 @@ func main() {
 		c.Redirect(http.StatusMovedPermanently, "/v2/")
 	})

+	r.ANY("/v2/:target/:user/:repo/*filepath", func(c *touka.Context) {
+		proxy.GhcrWithImageRouting(cfg)(c)
+	})
+
 	r.NoRoute(func(c *touka.Context) {
 		proxy.NoRouteHandler(cfg)(c)
 	})
@@ -521,7 +493,7 @@ func main() {
 	defer logger.Close()

 	addr := fmt.Sprintf("%s:%d", cfg.Server.Host, cfg.Server.Port)
-	err = r.RunShutdown(addr)
+	err := r.RunShutdown(addr)
 	if err != nil {
 		logger.Errorf("Server Run Error: %v", err)
 		fmt.Printf("Server Run Error: %v\n", err)
@@ -529,15 +501,3 @@ func main() {

 	fmt.Println("Program Exit")
 }
-
-func setBackendRoute(r *touka.Engine) {
-
-	backend, err := fs.Sub(backendFS, "backend")
-	if err != nil {
-		logger.Errorf("Failed to load embedded backend pages: %s", err)
-		fmt.Printf("Failed to load embedded backend pages: %s", err)
-		os.Exit(1)
-	}
-
-	r.StaticFS("/backend", http.FS(backend))
-}
--- a/proxy/chunkreq.go
+++ b/proxy/chunkreq.go
@@ -4,7 +4,6 @@ import (
 	"context"
 	"fmt"
 	"ghproxy/config"
-	"ghproxy/stats"
 	"io"
 	"net/http"
 	"strconv"
@@ -125,11 +124,7 @@ func ChunkedProxyRequest(ctx context.Context, c *touka.Context, u string, cfg *c
 		bodyReader = limitreader.NewRateLimitedReader(bodyReader, bandwidthLimit, int(bandwidthBurst), ctx)
 	}

-	countingReader := NewCountingReader(bodyReader)
-	defer countingReader.Close()
-	defer func() {
-		stats.Record(c.ClientIP(), countingReader.BytesRead())
-	}()
+	defer bodyReader.Close()

 	if MatcherShell(u) && matchString(matcher) && cfg.Shell.Editor {
 		// 判断body是不是gzip
@@ -143,7 +138,7 @@ func ChunkedProxyRequest(ctx context.Context, c *touka.Context, u string, cfg *c

 		var reader io.Reader

-		reader, _, err = processLinks(countingReader, compress, c.Request.Host, cfg, c)
+		reader, _, err = processLinks(bodyReader, compress, c.Request.Host, cfg, c)
 		c.WriteStream(reader)
 		if err != nil {
 			c.Errorf("%s %s %s %s %s Failed to copy response body: %v", c.ClientIP(), c.Request.Method, u, c.UserAgent(), c.Request.Proto, err)
@@ -154,10 +149,10 @@ func ChunkedProxyRequest(ctx context.Context, c *touka.Context, u string, cfg *c

 		if contentLength != "" {
 			c.SetHeader("Content-Length", contentLength)
-			c.WriteStream(countingReader)
+			c.WriteStream(bodyReader)
 			return
 		}
-		c.WriteStream(countingReader)
+		c.WriteStream(bodyReader)
 	}

 }
--- a/proxy/docker.go
+++ b/proxy/docker.go
@@ -40,167 +40,84 @@ func InitWeakCache() *weakcache.Cache[string] {
 	return cache
 }

-var (
-	authEndpoint = "/"
-	passTypeMap  = map[string]struct{}{
-		"manifests": {},
-		"blobs":     {},
-		"tags":      {},
-		"index":     {},
-	}
-)
-
-// 处理路径各种情况
-func OciWithImageRouting(cfg *config.Config) touka.HandlerFunc {
+// GhcrWithImageRouting 处理带有镜像路由的请求, 根据目标路由到不同的Docker注册表
+func GhcrWithImageRouting(cfg *config.Config) touka.HandlerFunc {
 	return func(c *touka.Context) {
-		if !cfg.Docker.Enabled {
-			ErrorPage(c, NewErrorWithStatusLookup(403, "Docker proxy is not enabled"))
-			return
-		}
-		var (
-			p1               string
-			p2               string
-			p3               string
-			p4               string
-			target           string
-			user             string
-			repo             string
-			extpath          string
-			p1IsTarget       bool
-			ignorep3         bool
-			imageNameForAuth string
-			finalreqUrl      string
-			iInfo            *imageInfo
-		)
-		ociPath := c.Param("path")
-		if ociPath == authEndpoint {
-			emptyJSON := "{}"
-			c.Header("Content-Type", "application/json")
-			c.Header("Content-Length", fmt.Sprint(len(emptyJSON)))
+		// 从 main.go 中固定的路由 "/v2/:target/:user/:repo/*filepath" 获取参数
+		reqTarget := c.Param("target")
+		reqImageUser := c.Param("user")
+		reqImageName := c.Param("repo")
+		reqFilePath := c.Param("filepath")

-			c.Header("Docker-Distribution-API-Version", "registry/2.0")
+		var upstreamTarget string
+		var requestPath string
+		var imageNameForAuth string

-			c.Status(200)
-			c.Writer.Write([]byte(emptyJSON))
-			return
-		}
-
-		// 根据/分割 /:target/:user/:repo/*ext
-		ociPath = ociPath[1:]
-		i := strings.IndexByte(ociPath, '/')
-		if i <= 0 {
-			ErrorPage(c, NewErrorWithStatusLookup(404, "Not Found"))
-			return
-		}
-		p1 = ociPath[:i]
-
-		// 开始判断p1是否为target
-		if strings.Contains(p1, ".") || strings.Contains(p1, ":") {
-			p1IsTarget = true
-			if p1 == "docker.io" {
-				target = dockerhubTarget
-			} else {
-				target = p1
-			}
+		// 关键逻辑: 判断 reqTarget 是真实主机名还是镜像名的一部分
+		// 依据: 真实主机名/IP通常包含'.'或':'
+		if strings.Contains(reqTarget, ".") || strings.Contains(reqTarget, ":") {
+			// 情况 A: reqTarget 是一个显式指定的主机名 (例如 "ghcr.io", "my-registry.com", "127.0.0.1:5000")
+			c.Debugf("Request target '%s' identified as an explicit hostname.", reqTarget)
+			upstreamTarget = reqTarget
+			// 上游请求的路径是主机名之后的部分
+			requestPath = fmt.Sprintf("%s/%s%s", reqImageUser, reqImageName, reqFilePath)
+			// 用于认证的镜像名是 user/repo
+			imageNameForAuth = fmt.Sprintf("%s/%s", reqImageUser, reqImageName)
 		} else {
+			// 情况 B: reqTarget 是镜像名的一部分 (例如 "wjqserver", "library")
+			c.Debugf("Request target '%s' identified as part of an image name. Using default registry.", reqTarget)
+			// 使用配置文件中的默认目标
 			switch cfg.Docker.Target {
 			case "ghcr":
-				target = ghcrTarget
+				upstreamTarget = ghcrTarget
 			case "dockerhub":
-				target = dockerhubTarget
+				upstreamTarget = dockerhubTarget
 			case "":
 				ErrorPage(c, NewErrorWithStatusLookup(500, "Default Docker Target is not configured in config file"))
 				return
 			default:
-				target = cfg.Docker.Target
+				upstreamTarget = cfg.Docker.Target
 			}
+			// 必须将路由错误分割的所有部分重新组合成完整的镜像路径
+			requestPath = fmt.Sprintf("%s/%s/%s%s", reqTarget, reqImageUser, reqImageName, reqFilePath)
+			// 用于认证的镜像名是 target/user (例如 "wjqserver/ghproxy", "library/ubuntu")
+			imageNameForAuth = fmt.Sprintf("%s/%s", reqTarget, reqImageUser)
 		}

-		ociPath = ociPath[i+1:]
-		i = strings.IndexByte(ociPath, '/')
-		if i <= 0 {
-			ErrorPage(c, NewErrorWithStatusLookup(404, "Not Found"))
-			return
-		}
-		p2 = ociPath[:i]
-		ociPath = ociPath[i+1:]
+		// 清理路径, 防止出现 "//"
+		requestPath = strings.TrimPrefix(requestPath, "/")

-		// 若p2和passTypeMap匹配
-		if !p1IsTarget {
-			if _, ok := passTypeMap[p2]; ok {
-				ignorep3 = true
-				switch cfg.Docker.Target {
-				case "ghcr":
-					target = ghcrTarget
-				case "dockerhub":
-					target = dockerhubTarget
-				case "":
-					ErrorPage(c, NewErrorWithStatusLookup(500, "Default Docker Target is not configured in config file"))
-					return
-				default:
-					target = cfg.Docker.Target
-				}
-				user = "library"
-				repo = p1
-				extpath = "/" + p2 + "/" + ociPath
-			}
-		}
-
-		if !ignorep3 {
-			i = strings.IndexByte(ociPath, '/')
-			if i <= 0 {
-				ErrorPage(c, NewErrorWithStatusLookup(404, "Not Found"))
-				return
-			}
-			p3 = ociPath[:i]
-
-			ociPath = ociPath[i+1:]
-			p4 = ociPath
-
-			if p1IsTarget {
-				if _, ok := passTypeMap[p3]; ok {
-					user = "library"
-					repo = p2
-					extpath = "/" + p3 + "/" + p4
-				} else {
-					user = p2
-					repo = p3
-					extpath = "/" + p4
-				}
-			} else {
-				switch cfg.Docker.Target {
-				case "ghcr":
-					target = ghcrTarget
-				case "dockerhub":
-					target = dockerhubTarget
-				case "":
-					ErrorPage(c, NewErrorWithStatusLookup(500, "Default Docker Target is not configured in config file"))
-					return
-				default:
-					target = cfg.Docker.Target
-				}
-				user = p1
-				repo = p2
-				extpath = "/" + p3 + "/" + p4
-			}
-		}
-
-		imageNameForAuth = user + "/" + repo
-		finalreqUrl = "https://" + target + "/v2/" + imageNameForAuth + extpath
-		if query := c.GetReqQueryString(); query != "" {
-			finalreqUrl += "?" + query
-		}
-
-		iInfo = &imageInfo{
-			User:  user,
-			Repo:  repo,
+		// 为认证和缓存准备镜像信息
+		image := &imageInfo{
 			Image: imageNameForAuth,
 		}

-		GhcrRequest(c.Request.Context(), c, finalreqUrl, iInfo, cfg, target)
+		// 调用 GhcrToTarget 处理实际的代理请求
+		GhcrToTarget(c, cfg, upstreamTarget, requestPath, image)
 	}
 }

+// GhcrToTarget 根据配置和目标信息将请求代理到上游Docker注册表
+func GhcrToTarget(c *touka.Context, cfg *config.Config, target string, path string, image *imageInfo) {
+	// 检查Docker代理是否启用
+	if !cfg.Docker.Enabled {
+		ErrorPage(c, NewErrorWithStatusLookup(403, "Docker is not Allowed"))
+		return
+	}
+
+	var ctx = c.Request.Context()
+
+	// 构造目标URL. 这里的target和path都是由GhcrWithImageRouting正确解析得来的.
+	destUrl := "https://" + target + "/v2/" + path
+	if query := c.GetReqQueryString(); query != "" {
+		destUrl += "?" + query
+	}
+	c.Debugf("Proxying to target '%s' with path '%s'. Final URL: %s", target, path, destUrl)
+
+	// 执行实际的代理请求
+	GhcrRequest(ctx, c, destUrl, image, cfg, target)
+}
+
 // GhcrRequest 执行对Docker注册表的HTTP请求, 处理认证和重定向
 func GhcrRequest(ctx context.Context, c *touka.Context, u string, image *imageInfo, cfg *config.Config, target string) {
 	var (
--- a/proxy/match.go
+++ b/proxy/match.go
@@ -23,7 +23,6 @@ const (
 	gistPrefix              = "https://gist.github.com/"
 	gistContentPrefix       = "https://gist.githubusercontent.com/"
 	apiPrefix               = "https://api.github.com/"
-	ociv2Prefix             = "https://v2/"
 	releasesDownloadSnippet = "releases/download/"
 )

@@ -37,11 +36,9 @@ func init() {

 // Matcher 从原始URL路径中高效地解析并匹配代理规则.
 func Matcher(rawPath string, cfg *config.Config) (string, string, string, *GHProxyErrors) {
-	/*
-		if len(rawPath) < 18 {
-			return "", "", "", NewErrorWithStatusLookup(404, "path too short")
-		}
-	*/
+	if len(rawPath) < 18 {
+		return "", "", "", NewErrorWithStatusLookup(404, "path too short")
+	}

 	// 匹配 "https://github.com/"
 	if strings.HasPrefix(rawPath, githubPrefix) {
--- a/proxy/utils.go
+++ b/proxy/utils.go
@@ -4,47 +4,10 @@ import (
 	"fmt"
 	"ghproxy/auth"
 	"ghproxy/config"
-	"io"

 	"github.com/infinite-iroha/touka"
 )

-// CountingReader is a reader that counts the number of bytes read.
-// CountingReader 是一个计算已读字节数的读取器.
-type CountingReader struct {
-	reader    io.Reader
-	bytesRead int64
-}
-
-// NewCountingReader creates a new CountingReader.
-// NewCountingReader 创建一个新的 CountingReader.
-func NewCountingReader(reader io.Reader) *CountingReader {
-	return &CountingReader{
-		reader: reader,
-	}
-}
-
-func (cr *CountingReader) Read(p []byte) (n int, err error) {
-	n, err = cr.reader.Read(p)
-	cr.bytesRead += int64(n)
-	return n, err
-}
-
-// BytesRead returns the number of bytes read.
-// BytesRead 返回已读字节数.
-func (cr *CountingReader) BytesRead() int64 {
-	return cr.bytesRead
-}
-
-// Close closes the underlying reader if it implements io.Closer.
-// 如果底层读取器实现了 io.Closer, 则关闭它.
-func (cr *CountingReader) Close() error {
-	if closer, ok := cr.reader.(io.Closer); ok {
-		return closer.Close()
-	}
-	return nil
-}
-
 func listCheck(cfg *config.Config, c *touka.Context, user string, repo string, rawPath string) bool {
 	if cfg.Auth.ForceAllowApi && cfg.Auth.ForceAllowApiPassList {
 		return false
--- a/stats/stats.go
+++ b/stats/stats.go
@@ -1,44 +0,0 @@
-package stats
-
-import (
-	"sync"
-	"time"
-)
-
-// ProxyStats store one ip's proxy stats
-// ProxyStats 存储一个IP的代理统计信息
-type ProxyStats struct {
-	IP               string    `json:"ip"`
-	LastCalled       time.Time `json:"last_called"`
-	CallCount        int64     `json:"call_count"`
-	TotalTransferred int64     `json:"total_transferred"`
-}
-
-var (
-	statsMap = &sync.Map{}
-)
-
-// Record update a ip's proxy stats
-// Record 更新一个IP的代理统计信息
-func Record(ip string, transferred int64) {
-	s, _ := statsMap.LoadOrStore(ip, &ProxyStats{
-		IP: ip,
-	})
-
-	ps := s.(*ProxyStats)
-	ps.LastCalled = time.Now()
-	ps.CallCount++
-	ps.TotalTransferred += transferred
-	statsMap.Store(ip, ps)
-}
-
-// GetStats return all proxy stats
-// GetStats 返回所有的代理统计信息
-func GetStats() map[string]*ProxyStats {
-	data := make(map[string]*ProxyStats)
-	statsMap.Range(func(key, value interface{}) bool {
-		data[key.(string)] = value.(*ProxyStats)
-		return true
-	})
-	return data
-}
Author	SHA1	Message	Date
WJQSERVER	b0388e6abc	Merge pull request #156 from WJQSERVER-STUDIO/dev 4.2.5	2025-07-31 20:01:31 +08:00
WJQSERVER	4b3f8e1018	Merge pull request #155 from WJQSERVER-STUDIO/dev remove test	2025-07-29 23:45:49 +08:00
WJQSERVER	078e556584	Merge pull request #154 from WJQSERVER-STUDIO/dev 4.2.4	2025-07-29 23:42:33 +08:00
WJQSERVER	3841bab164	Merge pull request #149 from WJQSERVER-STUDIO/dev 4.2.3	2025-07-27 15:46:42 +08:00
WJQSERVER	c6325fed3f	Merge pull request #148 from WJQSERVER-STUDIO/dev 4.2.2	2025-07-25 18:23:06 +08:00
WJQSERVER	f89fc53046	Merge pull request #146 from WJQSERVER-STUDIO/dev 4.2.1	2025-07-25 16:31:09 +08:00
WJQSERVER	88d84d0703	Merge pull request #143 from WJQSERVER-STUDIO/dev 4.2.0	2025-07-22 17:32:27 +08:00
WJQSERVER	80f52dda3c	Merge pull request #141 from WJQSERVER-STUDIO/dev 4.1.7	2025-07-20 22:34:43 +08:00
WJQSERVER	799a4895e5	Merge pull request #140 from WJQSERVER-STUDIO/dev update deps	2025-07-07 15:45:41 +08:00
WJQSERVER	a391895e7f	Merge pull request #139 from WJQSERVER-STUDIO/dev 4.1.6	2025-07-07 15:35:30 +08:00
里見灯花	4e469a4896	Merge pull request #138 from WJQSERVER-STUDIO/dev 4.1.5	2025-07-03 11:42:00 +08:00
WJQSERVER	7adab36c68	Merge pull request #136 from WJQSERVER-STUDIO/dev 4.1.4	2025-06-30 15:37:46 +08:00
WJQSERVER	f0902c1da3	Merge pull request #135 from WJQSERVER-STUDIO/dev 4.1.3	2025-06-25 17:59:16 +08:00
WJQSERVER	402308d620	Merge pull request #134 from WJQSERVER-STUDIO/dev	2025-06-18 17:21:17 +08:00
WJQSERVER	b701a89b98	Merge pull request #133 from WJQSERVER-STUDIO/dev 4.1.1	2025-06-18 09:06:11 +08:00
WJQSERVER	3812b029cf	Merge pull request #131 from WJQSERVER-STUDIO/dev 4.1.0	2025-06-17 17:05:42 +08:00
里見灯花	8ea741aec8	Merge pull request #130 from WJQSERVER-STUDIO/dev remove HertZ, Touka ready (v4)	2025-06-16 09:44:31 +08:00
@@ -1 +1 @@
 .3.3
 .2.5