From 5c14aeb48d9556d17ccaefb94690bb4286cb0f40 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B8=85=E9=9F=B5=27s?= <2359824360@qq.com> Date: Tue, 11 Feb 2025 12:06:43 +0800 Subject: [PATCH 01/13] Refactor the front-end page. --- pages/index.html | 715 +++++++++++++++++++++++------------------------ 1 file changed, 357 insertions(+), 358 deletions(-) diff --git a/pages/index.html b/pages/index.html index 554c293..30e59e0 100644 --- a/pages/index.html +++ b/pages/index.html @@ -1,440 +1,439 @@ - + - Github文件加速 + GitHub 文件加速服务 - - -
-
-
-
-

Github文件加速

-

为访问Github文件进行加速

-
-
- -
- -
- -

GitHub 链接带不带协议头均可，支持 release、archive 以及文件，转换后链接均可使用。

+
+ +
+

GitHub 文件加速服务

+

高速稳定的 GitHub 资源访问解决方案

+
+ + +
+
+
+ + +
+ +
+ + + -
-
-
-
-
文件大小限制
-

...

+
+ + +
+
+
+
+
+
文件大小限制
+ 最大支持文件尺寸
+ ...
-
-
-
-
白名单状态
-

...

+
+
+
+
+
+
白名单状态
+ 访问控制列表
+ ...
-
-
-
-
黑名单状态
-

...

+
+
+
+
+
+
黑名单状态
+ 屏蔽列表状态 +
+ ... +
+
+
+
+ + +
+

📚 详细使用指南

+ +
+

支持的工具

+
    +
  • ✅ 终端工具：Git / Wget / Curl
    • +
  • ✅ 支持域名：github.com
    • +
  • ✅ 支持域名：raw.githubusercontent.com
    • +
  • ✅ 支持域名：gist.githubusercontent.com
    • +
  • ❌ 不支持 SSH 协议克隆
    • +
+
+ +
+

基础用法示例

+ +
+

Git 克隆

+ git clone https://example.com/https://github.com/user/project.git + +

私有仓库克隆

+ git clone https://user:your_token@example.com/https://github.com/user/project.git +
+ +
+

文件下载

+ wget https://example.com/https://raw.githubusercontent.com/user/project/main/README.md + +

版本发布

+ curl -LO https://example.com/https://github.com/user/project/releases/download/v1.0.0./project_1.0.0.amd64.tar.gz +
+
+ +
+

支持的文件类型

+ +
+
+
+

原始文件

+ https://raw.githubusercontent.com/user/repo/main/file.txt +
+
+ +
+
+

分支源码

+ https://github.com/user/repo/archive/main.zip +
+
+ +
+
+

版本发布

+ https://github.com/user/repo/releases/download/v1.0.0/app.zip +
+
+ +
+
+

Gist 文件

+ https://gist.githubusercontent.com/user/gist_id/raw/file.txt
-
-
+ + -
- diff --git a/proxy/chunkreq.go b/proxy/chunkreq.go index e1279b2..a315e5c 100644 --- a/proxy/chunkreq.go +++ b/proxy/chunkreq.go @@ -5,21 +5,21 @@ import ( "fmt" "ghproxy/config" "io" - "net" "net/http" "strconv" "sync" "time" "github.com/gin-gonic/gin" + httpc "github.com/satomitouka/touka-httpc" ) var BufferSize int = 32 * 1024 // 32KB var ( - cclient *http.Client ctr *http.Transport BufferPool *sync.Pool + cclient *httpc.Client ) func InitReq(cfg *config.Config) { @@ -35,31 +35,38 @@ func InitReq(cfg *config.Config) { } func initChunkedHTTPClient(cfg *config.Config) { + /* + ctr = &http.Transport{ + MaxIdleConns: 100, + MaxConnsPerHost: 60, + 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, + } + */ ctr = &http.Transport{ - MaxIdleConns: 100, - MaxConnsPerHost: 60, - 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, + MaxIdleConns: 100, + MaxConnsPerHost: 60, + IdleConnTimeout: 20 * time.Second, } if cfg.Outbound.Enabled { initTransport(cfg, ctr) } - cclient = &http.Client{ - Transport: ctr, - } + cclient = httpc.New( + httpc.WithTransport(ctr), + ) } func ChunkedProxyRequest(c *gin.Context, u string, cfg *config.Config, mode string, runMode string) { method := c.Request.Method // 发送HEAD请求, 预获取Content-Length - headReq, err := http.NewRequest("HEAD", u, nil) + headReq, err := cclient.NewRequest("HEAD", u, nil) if err != nil { HandleError(c, fmt.Sprintf("Failed to create request: %v", err)) return @@ -92,13 +99,6 @@ func ChunkedProxyRequest(c *gin.Context, u string, cfg *config.Config, mode stri } } - /* - 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()) @@ -107,13 +107,11 @@ func ChunkedProxyRequest(c *gin.Context, u string, cfg *config.Config, mode stri bodyReader := bytes.NewBuffer(body) - // 创建请求 - req, err := http.NewRequest(method, u, bodyReader) + req, err := cclient.NewRequest(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头) AuthPassThrough(c, cfg, req) @@ -125,13 +123,6 @@ func ChunkedProxyRequest(c *gin.Context, u string, cfg *config.Config, mode stri } 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 - } - */ - // 错误处理(404) if resp.StatusCode == 404 { c.String(http.StatusNotFound, "File Not Found") diff --git a/proxy/gitreq.go b/proxy/gitreq.go index 117de27..4ceeac9 100644 --- a/proxy/gitreq.go +++ b/proxy/gitreq.go @@ -10,10 +10,11 @@ import ( "time" "github.com/gin-gonic/gin" + httpc "github.com/satomitouka/touka-httpc" ) var ( - gclient *http.Client + gclient *httpc.Client gtr *http.Transport ) @@ -26,20 +27,22 @@ func initGitHTTPClient(cfg *config.Config) { if cfg.Outbound.Enabled { initTransport(cfg, gtr) } - gclient = &http.Client{ - Transport: gtr, - } + /* + gclient = &http.Client{ + Transport: gtr, + } + */ + gclient = httpc.New( + httpc.WithTransport(gtr), + ) } func GitReq(c *gin.Context, u string, cfg *config.Config, mode string, runMode string) { method := c.Request.Method logInfo("%s %s %s %s %s", c.ClientIP(), method, u, c.Request.Header.Get("User-Agent"), c.Request.Proto) - // 创建HTTP客户端 - //client := &http.Client{} - // 发送HEAD请求, 预获取Content-Length - headReq, err := http.NewRequest("HEAD", u, nil) + headReq, err := gclient.NewRequest("HEAD", u, nil) if err != nil { HandleError(c, fmt.Sprintf("Failed to create request: %v", err)) return @@ -81,7 +84,7 @@ func GitReq(c *gin.Context, u string, cfg *config.Config, mode string, runMode s bodyReader := bytes.NewBuffer(body) // 创建请求 - req, err := http.NewRequest(method, u, bodyReader) + req, err := gclient.NewRequest(method, u, bodyReader) if err != nil { HandleError(c, fmt.Sprintf("Failed to create request: %v", err)) return @@ -101,12 +104,6 @@ func GitReq(c *gin.Context, u string, cfg *config.Config, mode string, runMode s } }(resp.Body) - /* - 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 - } - */ contentLength = resp.Header.Get("Content-Length") if contentLength != "" { size, err := strconv.Atoi(contentLength) From 785a74dfeb83504a30cef129a054adf2a6246ccf Mon Sep 17 00:00:00 2001 From: WJQSERVER Date: Sun, 16 Feb 2025 19:48:53 +0800 Subject: [PATCH 07/13] 25w14t-2 --- CHANGELOG.md | 9 +++++ DEV-VERSION | 2 +- README.md | 6 +++ auth/auth.go | 12 +++++- auth/whitelist.go | 98 ++++++++++++++++++++++++++++++---------------- config/config.go | 15 +++++++ config/config.toml | 6 +++ deploy/config.toml | 6 +++ go.mod | 4 +- go.sum | 14 +++++++ proxy/chunkreq.go | 59 ++-------------------------- proxy/gitreq.go | 46 +++++++--------------- proxy/handler.go | 2 +- proxy/httpc.go | 88 +++++++++++++++++++++++++++++++++++++++++ 14 files changed, 241 insertions(+), 126 deletions(-) create mode 100644 proxy/httpc.go diff --git a/CHANGELOG.md b/CHANGELOG.md index 97f9876..6f57a7c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,14 @@ # 更新日志 +25w14t-2 +--- +- PRE-RELEASE: 此版本是测试验证版本,请勿在生产环境中使用; +- CHANGE: 使用`touka-httpc`封装`HTTP Client`，更新到`v0.1.0`版本, 参看`touka-httpc` +- CHANGE: 重构`whitelist`实现 +- CHANGE: 对`proxy`进行结构性调整 +- CHANGE: `chunckedreq`与`gitreq`共用`BufferPool`和`HTTP Client` +- CHANGE: 新增`HTTP Client`配置块 + 25w14t-1 --- - PRE-RELEASE: 此版本是测试验证版本,请勿在生产环境中使用; diff --git a/DEV-VERSION b/DEV-VERSION index cca0ffd..b0f9cf0 100644 --- a/DEV-VERSION +++ b/DEV-VERSION @@ -1 +1 @@ -25w14t-1 \ No newline at end of file +25w14t-2 \ No newline at end of file diff --git a/README.md b/README.md index bf604ad..97b1c8a 100644 --- a/README.md +++ b/README.md @@ -91,6 +91,12 @@ port = 8080 # 监听端口 sizeLimit = 125 # 125MB enableH2C = "on" # 是否开启H2C传输(latest和dev版本请开启) on/off +[httpc] +mode = "auto" # "auto" or "advanced" HTTP客户端模式 自动/高级模式 +maxIdleConns = 100 # only for advanced mode 仅用于高级模式 +maxIdleConnsPerHost = 60 # only for advanced mode 仅用于高级模式 +maxConnsPerHost = 0 # only for advanced mode 仅用于高级模式 + [pages] enabled = false # 是否开启内置静态页面(Docker版本请关闭此项) staticPath = "/data/www" # 静态页面文件路径 diff --git a/auth/auth.go b/auth/auth.go index fdc5833..99cb6de 100644 --- a/auth/auth.go +++ b/auth/auth.go @@ -18,10 +18,18 @@ var ( func Init(cfg *config.Config) { if cfg.Blacklist.Enabled { - InitBlacklist(cfg) + err := InitBlacklist(cfg) + if err != nil { + logError(err.Error()) + return + } } if cfg.Whitelist.Enabled { - LoadWhitelist(cfg) + err := InitWhitelist(cfg) + if err != nil { + logError(err.Error()) + return + } } logDebug("Auth Init") } diff --git a/auth/whitelist.go b/auth/whitelist.go index 000b016..ee93c20 100644 --- a/auth/whitelist.go +++ b/auth/whitelist.go @@ -2,58 +2,90 @@ package auth import ( "encoding/json" + "fmt" "ghproxy/config" "os" "strings" + "sync" ) -type WhitelistConfig struct { - Whitelist []string `json:"whitelist"` +// Whitelist 用于存储白名单信息 +type Whitelist struct { + userSet map[string]struct{} // 用户级白名单 + repoSet map[string]map[string]struct{} // 仓库级白名单 + initOnce sync.Once // 确保初始化只执行一次 + initialized bool // 初始化状态标识 } var ( - whitelistfile = "/data/ghproxy/config/whitelist.json" - whitelist *WhitelistConfig + whitelistInstance *Whitelist + whitelistInitErr error ) -func LoadWhitelist(cfg *config.Config) { - whitelistfile = cfg.Whitelist.WhitelistFile - whitelist = &WhitelistConfig{} +// InitWhitelist 初始化白名单（线程安全，仅执行一次） +func InitWhitelist(cfg *config.Config) error { + whitelistInstance = &Whitelist{ + userSet: make(map[string]struct{}), + repoSet: make(map[string]map[string]struct{}), + } - data, err := os.ReadFile(whitelistfile) + data, err := os.ReadFile(cfg.Whitelist.WhitelistFile) if err != nil { - logError("Failed to read whitelist file: %v", err) + return fmt.Errorf("failed to read whitelist: %w", err) } - err = json.Unmarshal(data, whitelist) - if err != nil { - logError("Failed to unmarshal whitelist JSON: %v", err) + var list struct { + Entries []string `json:"whitelist"` } -} - -func CheckWhitelist(fullrepo string, user string, repo string) bool { - return forRangeCheckWhitelist(whitelist.Whitelist, fullrepo, user) -} - -func sliceRepoName_Whitelist(fullrepo string) (string, string) { - s := strings.Split(fullrepo, "/") - if len(s) != 2 { - return "", "" + if err := json.Unmarshal(data, &list); err != nil { + return fmt.Errorf("invalid whitelist format: %w", err) } - return s[0], s[1] -} -func forRangeCheckWhitelist(wlist []string, fullrepo string, user string) bool { - for _, passd := range wlist { - users, _ := sliceRepoName_Whitelist(passd) - if users == user { - if strings.HasSuffix(passd, "/*") { - return true - } - if fullrepo == passd { - return true + for _, entry := range list.Entries { + user, repo := splitUserRepoWhitelist(entry) + switch { + case repo == "" || repo == "*": + whitelistInstance.userSet[user] = struct{}{} + default: + if _, exists := whitelistInstance.repoSet[user]; !exists { + whitelistInstance.repoSet[user] = make(map[string]struct{}) } + whitelistInstance.repoSet[user][repo] = struct{}{} } } + + whitelistInstance.initialized = true + return nil +} + +// CheckWhitelist 检查用户和仓库是否在白名单中（无锁设计） +func CheckWhitelist(username, repo string) bool { + if whitelistInstance == nil || !whitelistInstance.initialized { + return false + } + + // 先检查用户级白名单 + if _, exists := whitelistInstance.userSet[username]; exists { + return true + } + + // 再检查仓库级白名单 + if repos, userExists := whitelistInstance.repoSet[username]; userExists { + // 允许仓库名为空时的全用户仓库匹配 + if repo == "" { + return true + } + _, repoExists := repos[repo] + return repoExists + } + return false } + +// splitUserRepoWhitelist 分割用户和仓库信息（仅初始化时使用） +func splitUserRepoWhitelist(fullRepo string) (user, repo string) { + if idx := strings.Index(fullRepo, "/"); idx > 0 { + return fullRepo[:idx], fullRepo[idx+1:] + } + return fullRepo, "" +} diff --git a/config/config.go b/config/config.go index 9335b14..bad1557 100644 --- a/config/config.go +++ b/config/config.go @@ -6,6 +6,7 @@ import ( type Config struct { Server ServerConfig + Httpc HttpcConfig Pages PagesConfig Log LogConfig CORS CORSConfig @@ -24,6 +25,20 @@ type ServerConfig struct { Debug bool `toml:"debug"` } +/* +[httpc] +mode = "auto" # "auto" or "advanced" +maxIdleConns = 100 # only for advanced mode +maxIdleConnsPerHost = 60 # only for advanced mode +maxConnsPerHost = 0 # only for advanced mode +*/ +type HttpcConfig struct { + Mode string `toml:"mode"` + MaxIdleConns int `toml:"maxIdleConns"` + MaxIdleConnsPerHost int `toml:"maxIdleConnsPerHost"` + MaxConnsPerHost int `toml:"maxConnsPerHost"` +} + type PagesConfig struct { Enabled bool `toml:"enabled"` StaticDir string `toml:"staticDir"` diff --git a/config/config.toml b/config/config.toml index 5613f2e..12f1422 100644 --- a/config/config.toml +++ b/config/config.toml @@ -5,6 +5,12 @@ sizeLimit = 125 # MB enableH2C = "on" # "on" or "off" debug = false +[httpc] +mode = "auto" # "auto" or "advanced" +maxIdleConns = 100 # only for advanced mode +maxIdleConnsPerHost = 60 # only for advanced mode +maxConnsPerHost = 0 # only for advanced mode + [pages] enabled = false staticDir = "/data/www" diff --git a/deploy/config.toml b/deploy/config.toml index c217b5d..bdbcfcf 100644 --- a/deploy/config.toml +++ b/deploy/config.toml @@ -5,6 +5,12 @@ sizeLimit = 125 # MB enableH2C = "on" debug = false +[httpc] +mode = "auto" # "auto" or "advanced" +maxIdleConns = 100 # only for advanced mode +maxIdleConnsPerHost = 60 # only for advanced mode +maxConnsPerHost = 0 # only for advanced mode + [pages] enabled = false staticDir = "/usr/local/ghproxy/pages" diff --git a/go.mod b/go.mod index 73e5d65..0447312 100644 --- a/go.mod +++ b/go.mod @@ -6,7 +6,7 @@ require ( github.com/BurntSushi/toml v1.4.0 github.com/WJQSERVER-STUDIO/go-utils/logger v1.3.0 github.com/gin-gonic/gin v1.10.0 - github.com/satomitouka/touka-httpc v0.0.3 + github.com/satomitouka/touka-httpc v0.1.0 golang.org/x/net v0.35.0 golang.org/x/time v0.10.0 ) @@ -19,7 +19,7 @@ require ( github.com/gin-contrib/sse v1.0.0 // indirect github.com/go-playground/locales v0.14.1 // indirect github.com/go-playground/universal-translator v0.18.1 // indirect - github.com/go-playground/validator/v10 v10.24.0 // indirect + github.com/go-playground/validator/v10 v10.25.0 // indirect github.com/goccy/go-json v0.10.5 // indirect github.com/google/go-cmp v0.6.0 // indirect github.com/json-iterator/go v1.1.12 // indirect diff --git a/go.sum b/go.sum index 897730f..f54b7f8 100644 --- a/go.sum +++ b/go.sum @@ -27,6 +27,8 @@ github.com/go-playground/universal-translator v0.18.1 h1:Bcnm0ZwsGyWbCzImXv+pAJn github.com/go-playground/universal-translator v0.18.1/go.mod h1:xekY+UJKNuX9WP91TpwSH2VMlDf28Uj24BCp08ZFTUY= github.com/go-playground/validator/v10 v10.24.0 h1:KHQckvo8G6hlWnrPX4NJJ+aBfWNAE/HH+qdL2cBpCmg= github.com/go-playground/validator/v10 v10.24.0/go.mod h1:GGzBIJMuE98Ic/kJsBXbz1x/7cByt++cQ+YOuDM5wus= +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= @@ -53,6 +55,18 @@ github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZb github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= github.com/satomitouka/touka-httpc v0.0.3 h1:SLb14DWBIDeIaNQ0wMwRwJMjUDakHVR1Jbdct3Qi8fA= github.com/satomitouka/touka-httpc v0.0.3/go.mod h1:ULB/0Ze0Apm46YKl35Jmj1hW5YLVVeOGqCqn+ijqGPM= +github.com/satomitouka/touka-httpc v0.0.4 h1:sZs/2kqTSyLQ/pDHs/71l7MSG46j4rZNKfqn3CFAboU= +github.com/satomitouka/touka-httpc v0.0.4/go.mod h1:ULB/0Ze0Apm46YKl35Jmj1hW5YLVVeOGqCqn+ijqGPM= +github.com/satomitouka/touka-httpc v0.0.5 h1:ov1v29vrjvwRNbGqFJHmrCp+3/qXLoyWubO4kTDvb28= +github.com/satomitouka/touka-httpc v0.0.5/go.mod h1:ULB/0Ze0Apm46YKl35Jmj1hW5YLVVeOGqCqn+ijqGPM= +github.com/satomitouka/touka-httpc v0.0.6 h1:1iSaTB9KpviXy2NHvMXuRzy5mkcvle+fktWPhpS907c= +github.com/satomitouka/touka-httpc v0.0.6/go.mod h1:ULB/0Ze0Apm46YKl35Jmj1hW5YLVVeOGqCqn+ijqGPM= +github.com/satomitouka/touka-httpc v0.0.7 h1:igoLqXs6R1yNIdKMcfpwRB1l6KLLus6DvWT3xL1T5FY= +github.com/satomitouka/touka-httpc v0.0.7/go.mod h1:ULB/0Ze0Apm46YKl35Jmj1hW5YLVVeOGqCqn+ijqGPM= +github.com/satomitouka/touka-httpc v0.0.8 h1:KW521Z2z9BarnTgCajug/W/tIbnoIH+CzA7CON19iAg= +github.com/satomitouka/touka-httpc v0.0.8/go.mod h1:ULB/0Ze0Apm46YKl35Jmj1hW5YLVVeOGqCqn+ijqGPM= +github.com/satomitouka/touka-httpc v0.1.0 h1:CXCsr6NhdskK/W/ezvhwK2CP8QGCxewkBhsEjrM7K8s= +github.com/satomitouka/touka-httpc v0.1.0/go.mod h1:ULB/0Ze0Apm46YKl35Jmj1hW5YLVVeOGqCqn+ijqGPM= 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= diff --git a/proxy/chunkreq.go b/proxy/chunkreq.go index a315e5c..313dd41 100644 --- a/proxy/chunkreq.go +++ b/proxy/chunkreq.go @@ -7,66 +7,15 @@ import ( "io" "net/http" "strconv" - "sync" - "time" "github.com/gin-gonic/gin" - httpc "github.com/satomitouka/touka-httpc" ) -var BufferSize int = 32 * 1024 // 32KB - -var ( - ctr *http.Transport - BufferPool *sync.Pool - cclient *httpc.Client -) - -func InitReq(cfg *config.Config) { - initChunkedHTTPClient(cfg) - initGitHTTPClient(cfg) - - // 初始化固定大小的缓存池 - BufferPool = &sync.Pool{ - New: func() interface{} { - return make([]byte, BufferSize) - }, - } -} - -func initChunkedHTTPClient(cfg *config.Config) { - /* - ctr = &http.Transport{ - MaxIdleConns: 100, - MaxConnsPerHost: 60, - 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, - } - */ - ctr = &http.Transport{ - MaxIdleConns: 100, - MaxConnsPerHost: 60, - IdleConnTimeout: 20 * time.Second, - } - if cfg.Outbound.Enabled { - initTransport(cfg, ctr) - } - cclient = httpc.New( - httpc.WithTransport(ctr), - ) -} - func ChunkedProxyRequest(c *gin.Context, u string, cfg *config.Config, mode string, runMode string) { method := c.Request.Method // 发送HEAD请求, 预获取Content-Length - headReq, err := cclient.NewRequest("HEAD", u, nil) + headReq, err := client.NewRequest("HEAD", u, nil) if err != nil { HandleError(c, fmt.Sprintf("Failed to create request: %v", err)) return @@ -75,7 +24,7 @@ func ChunkedProxyRequest(c *gin.Context, u string, cfg *config.Config, mode stri removeWSHeader(headReq) // 删除Conection Upgrade头, 避免与HTTP/2冲突(检查是否存在Upgrade头) AuthPassThrough(c, cfg, headReq) - headResp, err := cclient.Do(headReq) + headResp, err := client.Do(headReq) if err != nil { HandleError(c, fmt.Sprintf("Failed to send request: %v", err)) return @@ -107,7 +56,7 @@ func ChunkedProxyRequest(c *gin.Context, u string, cfg *config.Config, mode stri bodyReader := bytes.NewBuffer(body) - req, err := cclient.NewRequest(method, u, bodyReader) + req, err := client.NewRequest(method, u, bodyReader) if err != nil { HandleError(c, fmt.Sprintf("Failed to create request: %v", err)) return @@ -116,7 +65,7 @@ func ChunkedProxyRequest(c *gin.Context, u string, cfg *config.Config, mode stri removeWSHeader(req) // 删除Conection Upgrade头, 避免与HTTP/2冲突(检查是否存在Upgrade头) AuthPassThrough(c, cfg, req) - resp, err := cclient.Do(req) + resp, err := client.Do(req) if err != nil { HandleError(c, fmt.Sprintf("Failed to send request: %v", err)) return diff --git a/proxy/gitreq.go b/proxy/gitreq.go index 4ceeac9..3b2c13f 100644 --- a/proxy/gitreq.go +++ b/proxy/gitreq.go @@ -7,42 +7,16 @@ import ( "io" "net/http" "strconv" - "time" "github.com/gin-gonic/gin" - httpc "github.com/satomitouka/touka-httpc" ) -var ( - gclient *httpc.Client - gtr *http.Transport -) - -func initGitHTTPClient(cfg *config.Config) { - gtr = &http.Transport{ - MaxIdleConns: 30, - MaxConnsPerHost: 30, - IdleConnTimeout: 30 * time.Second, - } - if cfg.Outbound.Enabled { - initTransport(cfg, gtr) - } - /* - gclient = &http.Client{ - Transport: gtr, - } - */ - gclient = httpc.New( - httpc.WithTransport(gtr), - ) -} - func GitReq(c *gin.Context, u string, cfg *config.Config, mode string, runMode string) { method := c.Request.Method logInfo("%s %s %s %s %s", c.ClientIP(), method, u, c.Request.Header.Get("User-Agent"), c.Request.Proto) // 发送HEAD请求, 预获取Content-Length - headReq, err := gclient.NewRequest("HEAD", u, nil) + headReq, err := client.NewRequest("HEAD", u, nil) if err != nil { HandleError(c, fmt.Sprintf("Failed to create request: %v", err)) return @@ -50,7 +24,7 @@ func GitReq(c *gin.Context, u string, cfg *config.Config, mode string, runMode s setRequestHeaders(c, headReq) AuthPassThrough(c, cfg, headReq) - headResp, err := gclient.Do(headReq) + headResp, err := client.Do(headReq) if err != nil { HandleError(c, fmt.Sprintf("Failed to send request: %v", err)) return @@ -84,7 +58,7 @@ func GitReq(c *gin.Context, u string, cfg *config.Config, mode string, runMode s bodyReader := bytes.NewBuffer(body) // 创建请求 - req, err := gclient.NewRequest(method, u, bodyReader) + req, err := client.NewRequest(method, u, bodyReader) if err != nil { HandleError(c, fmt.Sprintf("Failed to create request: %v", err)) return @@ -92,7 +66,7 @@ func GitReq(c *gin.Context, u string, cfg *config.Config, mode string, runMode s setRequestHeaders(c, req) AuthPassThrough(c, cfg, req) - resp, err := gclient.Do(req) + resp, err := client.Do(req) if err != nil { HandleError(c, fmt.Sprintf("Failed to send request: %v", err)) return @@ -139,7 +113,15 @@ func GitReq(c *gin.Context, u string, cfg *config.Config, mode string, runMode s c.Status(resp.StatusCode) - if _, err := io.Copy(c.Writer, 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) + // 使用固定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) + return + } else { + c.Writer.Flush() // 确保刷入 } } diff --git a/proxy/handler.go b/proxy/handler.go index 480aa67..f999b47 100644 --- a/proxy/handler.go +++ b/proxy/handler.go @@ -61,7 +61,7 @@ func NoRouteHandler(cfg *config.Config, limiter *rate.RateLimiter, iplimiter *ra // 白名单检查 if cfg.Whitelist.Enabled { - whitelist := auth.CheckWhitelist(repouser, username, repo) + 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) diff --git a/proxy/httpc.go b/proxy/httpc.go new file mode 100644 index 0000000..8048821 --- /dev/null +++ b/proxy/httpc.go @@ -0,0 +1,88 @@ +package proxy + +import ( + "fmt" + "ghproxy/config" + "net/http" + "sync" + "time" + + httpc "github.com/satomitouka/touka-httpc" +) + +var BufferSize int = 32 * 1024 // 32KB + +var ( + tr *http.Transport + BufferPool *sync.Pool + client *httpc.Client +) + +func InitReq(cfg *config.Config) { + initHTTPClient(cfg) + + // 初始化固定大小的缓存池 + BufferPool = &sync.Pool{ + New: func() interface{} { + return make([]byte, BufferSize) + }, + } +} + +func initHTTPClient(cfg *config.Config) { + /* + ctr = &http.Transport{ + MaxIdleConns: 100, + MaxConnsPerHost: 60, + 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 + } + } else if cfg.Httpc.Mode == "advanced" { + tr = &http.Transport{ + MaxIdleConns: cfg.Httpc.MaxIdleConns, + MaxConnsPerHost: cfg.Httpc.MaxConnsPerHost, + MaxIdleConnsPerHost: cfg.Httpc.MaxIdleConnsPerHost, + WriteBufferSize: 32 * 1024, // 32KB + ReadBufferSize: 32 * 1024, // 32KB + } + } 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") + tr = &http.Transport{ + //MaxIdleConns: 160, + IdleConnTimeout: 30 * time.Second, + WriteBufferSize: 32 * 1024, // 32KB + ReadBufferSize: 32 * 1024, // 32KB + } + } + if cfg.Outbound.Enabled { + initTransport(cfg, tr) + } + if cfg.Server.Debug { + client = httpc.New( + httpc.WithTransport(tr), + httpc.WithDumpLog(), + ) + } else { + client = httpc.New( + httpc.WithTransport(tr), + ) + } +} From 83368969797bc0a23d1881a10358a4b7cddcc896 Mon Sep 17 00:00:00 2001 From: WJQSERVER Date: Tue, 18 Feb 2025 10:19:11 +0800 Subject: [PATCH 08/13] feat(pages): add page theme configuration and static files --- README.md | 1 + config/config.go | 7 + config/config.toml | 1 + deploy/config.toml | 1 + deploy/install-dev.sh | 4 +- deploy/install.sh | 4 +- go.mod | 2 +- go.sum | 18 +- main.go | 24 +- pages/{ => bootstrap}/favicon.ico | Bin pages/bootstrap/index.html | 440 ++++++++++++++++++++++++++++++ pages/nebula/favicon.ico | Bin 0 -> 3262 bytes pages/{ => nebula}/index.html | 0 13 files changed, 477 insertions(+), 25 deletions(-) rename pages/{ => bootstrap}/favicon.ico (100%) create mode 100644 pages/bootstrap/index.html create mode 100644 pages/nebula/favicon.ico rename pages/{ => nebula}/index.html (100%) diff --git a/README.md b/README.md index 97b1c8a..eb246b7 100644 --- a/README.md +++ b/README.md @@ -99,6 +99,7 @@ maxConnsPerHost = 0 # only for advanced mode 仅用于高级模式 [pages] enabled = false # 是否开启内置静态页面(Docker版本请关闭此项) +theme = "bootstrap" # "bootstrap" or "nebula" 内置主题 staticPath = "/data/www" # 静态页面文件路径 [log] diff --git a/config/config.go b/config/config.go index bad1557..de887ce 100644 --- a/config/config.go +++ b/config/config.go @@ -39,8 +39,15 @@ type HttpcConfig struct { MaxConnsPerHost int `toml:"maxConnsPerHost"` } +/* +[pages] +enabled = false +theme = "bootstrap" # "bootstrap" or "nebula" +staticDir = "/data/www" +*/ type PagesConfig struct { Enabled bool `toml:"enabled"` + Theme string `toml:"theme"` StaticDir string `toml:"staticDir"` } diff --git a/config/config.toml b/config/config.toml index 12f1422..919bcb8 100644 --- a/config/config.toml +++ b/config/config.toml @@ -13,6 +13,7 @@ maxConnsPerHost = 0 # only for advanced mode [pages] enabled = false +theme = "bootstrap" # "bootstrap" or "nebula" staticDir = "/data/www" [log] diff --git a/deploy/config.toml b/deploy/config.toml index bdbcfcf..8f80a32 100644 --- a/deploy/config.toml +++ b/deploy/config.toml @@ -13,6 +13,7 @@ maxConnsPerHost = 0 # only for advanced mode [pages] enabled = false +theme = "bootstrap" # "bootstrap" or "nebula" staticDir = "/usr/local/ghproxy/pages" [log] diff --git a/deploy/install-dev.sh b/deploy/install-dev.sh index 03d6030..e412c46 100644 --- a/deploy/install-dev.sh +++ b/deploy/install-dev.sh @@ -90,8 +90,8 @@ tar -zxvf ${ghproxy_dir}/ghproxy-linux-$ARCH.tar.gz -C ${ghproxy_dir} chmod +x ${ghproxy_dir}/ghproxy # 下载pages -wget -q -O ${ghproxy_dir}/pages/index.html https://raw.githubusercontent.com/WJQSERVER-STUDIO/ghproxy/dev/pages/index.html -wget -q -O ${ghproxy_dir}/pages/favicon.ico https://raw.githubusercontent.com/WJQSERVER-STUDIO/ghproxy/dev/pages/favicon.ico +wget -q -O ${ghproxy_dir}/pages/index.html https://raw.githubusercontent.com/WJQSERVER-STUDIO/ghproxy/dev/pages/boostrap/index.html +wget -q -O ${ghproxy_dir}/pages/favicon.ico https://raw.githubusercontent.com/WJQSERVER-STUDIO/ghproxy/dev/pages/bootstrap/favicon.ico # 下载配置文件 diff --git a/deploy/install.sh b/deploy/install.sh index b054299..f050a0b 100644 --- a/deploy/install.sh +++ b/deploy/install.sh @@ -90,8 +90,8 @@ tar -zxvf ${ghproxy_dir}/ghproxy-linux-$ARCH.tar.gz -C ${ghproxy_dir} chmod +x ${ghproxy_dir}/ghproxy # 下载pages -wget -q -O ${ghproxy_dir}/pages/index.html https://raw.githubusercontent.com/WJQSERVER-STUDIO/ghproxy/main/pages/index.html -wget -q -O ${ghproxy_dir}/pages/favicon.ico https://raw.githubusercontent.com/WJQSERVER-STUDIO/ghproxy/main/pages/favicon.ico +wget -q -O ${ghproxy_dir}/pages/index.html https://raw.githubusercontent.com/WJQSERVER-STUDIO/ghproxy/main/pages/bootstrap/index.html +wget -q -O ${ghproxy_dir}/pages/favicon.ico https://raw.githubusercontent.com/WJQSERVER-STUDIO/ghproxy/main/pages/bootstrap/favicon.ico # 下载配置文件 diff --git a/go.mod b/go.mod index 0447312..f739c4e 100644 --- a/go.mod +++ b/go.mod @@ -6,7 +6,7 @@ require ( github.com/BurntSushi/toml v1.4.0 github.com/WJQSERVER-STUDIO/go-utils/logger v1.3.0 github.com/gin-gonic/gin v1.10.0 - github.com/satomitouka/touka-httpc v0.1.0 + github.com/satomitouka/touka-httpc v0.2.0 golang.org/x/net v0.35.0 golang.org/x/time v0.10.0 ) diff --git a/go.sum b/go.sum index f54b7f8..7c6bb67 100644 --- a/go.sum +++ b/go.sum @@ -25,8 +25,6 @@ github.com/go-playground/locales v0.14.1 h1:EWaQ/wswjilfKLTECiXz7Rh+3BjFhfDFKv/o github.com/go-playground/locales v0.14.1/go.mod h1:hxrqLVvrK65+Rwrd5Fc6F2O76J/NuW9t0sjnWqG1slY= github.com/go-playground/universal-translator v0.18.1 h1:Bcnm0ZwsGyWbCzImXv+pAJnYK9S473LQFuzCbDbfSFY= github.com/go-playground/universal-translator v0.18.1/go.mod h1:xekY+UJKNuX9WP91TpwSH2VMlDf28Uj24BCp08ZFTUY= -github.com/go-playground/validator/v10 v10.24.0 h1:KHQckvo8G6hlWnrPX4NJJ+aBfWNAE/HH+qdL2cBpCmg= -github.com/go-playground/validator/v10 v10.24.0/go.mod h1:GGzBIJMuE98Ic/kJsBXbz1x/7cByt++cQ+YOuDM5wus= 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= @@ -53,20 +51,8 @@ github.com/pelletier/go-toml/v2 v2.2.3 h1:YmeHyLY8mFWbdkNWwpr+qIL2bEqT0o95WSdkNH 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.0.3 h1:SLb14DWBIDeIaNQ0wMwRwJMjUDakHVR1Jbdct3Qi8fA= -github.com/satomitouka/touka-httpc v0.0.3/go.mod h1:ULB/0Ze0Apm46YKl35Jmj1hW5YLVVeOGqCqn+ijqGPM= -github.com/satomitouka/touka-httpc v0.0.4 h1:sZs/2kqTSyLQ/pDHs/71l7MSG46j4rZNKfqn3CFAboU= -github.com/satomitouka/touka-httpc v0.0.4/go.mod h1:ULB/0Ze0Apm46YKl35Jmj1hW5YLVVeOGqCqn+ijqGPM= -github.com/satomitouka/touka-httpc v0.0.5 h1:ov1v29vrjvwRNbGqFJHmrCp+3/qXLoyWubO4kTDvb28= -github.com/satomitouka/touka-httpc v0.0.5/go.mod h1:ULB/0Ze0Apm46YKl35Jmj1hW5YLVVeOGqCqn+ijqGPM= -github.com/satomitouka/touka-httpc v0.0.6 h1:1iSaTB9KpviXy2NHvMXuRzy5mkcvle+fktWPhpS907c= -github.com/satomitouka/touka-httpc v0.0.6/go.mod h1:ULB/0Ze0Apm46YKl35Jmj1hW5YLVVeOGqCqn+ijqGPM= -github.com/satomitouka/touka-httpc v0.0.7 h1:igoLqXs6R1yNIdKMcfpwRB1l6KLLus6DvWT3xL1T5FY= -github.com/satomitouka/touka-httpc v0.0.7/go.mod h1:ULB/0Ze0Apm46YKl35Jmj1hW5YLVVeOGqCqn+ijqGPM= -github.com/satomitouka/touka-httpc v0.0.8 h1:KW521Z2z9BarnTgCajug/W/tIbnoIH+CzA7CON19iAg= -github.com/satomitouka/touka-httpc v0.0.8/go.mod h1:ULB/0Ze0Apm46YKl35Jmj1hW5YLVVeOGqCqn+ijqGPM= -github.com/satomitouka/touka-httpc v0.1.0 h1:CXCsr6NhdskK/W/ezvhwK2CP8QGCxewkBhsEjrM7K8s= -github.com/satomitouka/touka-httpc v0.1.0/go.mod h1:ULB/0Ze0Apm46YKl35Jmj1hW5YLVVeOGqCqn+ijqGPM= +github.com/satomitouka/touka-httpc v0.2.0 h1:JohnKH0T5KuVcouycqSI70oJIhMxY1nlNDhgZRxI73s= +github.com/satomitouka/touka-httpc v0.2.0/go.mod h1:ULB/0Ze0Apm46YKl35Jmj1hW5YLVVeOGqCqn+ijqGPM= 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= diff --git a/main.go b/main.go index 88606f7..863caa6 100644 --- a/main.go +++ b/main.go @@ -35,8 +35,10 @@ var ( ) var ( - //go:embed pages/* + //go:embed pages/bootstrap/* pagesFS embed.FS + //go:embed pages/nebula/* + NebulaPagesFS embed.FS ) var ( @@ -159,9 +161,23 @@ func init() { }) router.StaticFile("/favicon.ico", faviconPath) } else if !cfg.Pages.Enabled { - pages, err := fs.Sub(pagesFS, "pages") - if err != nil { - logError("Failed when processing pages: %s", err) + 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)))) diff --git a/pages/favicon.ico b/pages/bootstrap/favicon.ico similarity index 100% rename from pages/favicon.ico rename to pages/bootstrap/favicon.ico diff --git a/pages/bootstrap/index.html b/pages/bootstrap/index.html new file mode 100644 index 0000000..066332a --- /dev/null +++ b/pages/bootstrap/index.html @@ -0,0 +1,440 @@ + + + + + + + Github文件加速 + + + + + + + +
+
+
+
+

Github文件加速

+

为访问Github文件进行加速

+
+
+ +
+ +
+ +

GitHub 链接带不带协议头均可，支持 release、archive 以及文件，转换后链接均可使用。

+
+
+
+
+
+
+
文件大小限制
+

...

+
+
+
+
+
+
+
白名单状态
+

...

+
+
+
+
+
+
+
黑名单状态
+

...

+
+
+
+
+
+ +
+ +
+ +
+ +
+ + + + + + \ No newline at end of file diff --git a/pages/nebula/favicon.ico b/pages/nebula/favicon.ico new file mode 100644 index 0000000000000000000000000000000000000000..9c04d31ade74151073f9c5d87d6dc75f72d58111 GIT binary patch literal 3262 zcmc(g%PaO<6vux!?)QX)(#zx+G4Yz1oB=`xk4_k~2{*$u+lPAVnFQnV84` zu2mwhy4uW$JqDx_t)3gx3@R6g~s8NNtS-h{~Q4w9s4>n zn0*F-6UM&!nXe3$@bU5S=;&xgMaB2;-+yyhYHDg}Y3cCr@ZsU16bNB<_nD@dmpGrh zySwG(<$ivCoSBD*hx5r4U{3GDiKCcPfz)pG~&Pj=jZ1?KR>e(6ig|c9A#czT@9W*jRK#= z#l=HILn9+2EiEm*y}cwHA0N*=7z{8zwQ{4cYtYx%Cvip$uBud3RdsQ3v9+~DwO3bH zcXoDygM$Td06+45R&auXK3*#T z>EmETVTlkDH1$!$`ucjnl-Cf!Pfbmc`Qzi`{{BAsZ)|Lk|MvEFNJxl*DTFd9Dk^f) z*NL2;pNEBo8H&K2ot@-UR#rARI0)FMF&0f+hk;KVVB8zT3aOza_){Os&37|Dv2 zmX^jX_4V~-J|Q9D^70ZEZGmxaZcg)#2p{(fGjy(jK^mvAu@QiZgM-Dz#lcEXPhVbM zzQ4bJd3gc+af2QG=l1q?U|_)MltpL1Ak8W3EHX1Q(Nz9XQBjeRk$jevlz_z0lw(G* zmX?+R0s=Ve*w|Qqe}C?ORA5` zSW{EuUSFXX78VRqbS?%&lf2U4;RBPhU{nd1qT{%lh+JJm6rINo*lb+R{QSI0L&p>z z9?qixX)dA&D!QRxU0p>)M1YjIkj>4_LIQR*mKGNm4Mjvc%+b*i zOZJUx3r$T;fVIbe-6ivnf@ zT^&}ni;0N|^9!Qn83}}$PgRVU+uz@>%-xGCoC$Gqa>7PJLqk;rlezgMfx5c7gM$Nz zWc3wsvm=AQzP_g06DTVyiylQA%*e=~_07!8@Vf@y Date: Tue, 18 Feb 2025 10:34:24 +0800 Subject: [PATCH 09/13] 25w14a --- CHANGELOG.md | 13 ++ DEV-VERSION | 2 +- main.go | 2 + pages/bootstrap/index.html | 341 +------------------------------------ pages/bootstrap/script.js | 84 +++++++++ pages/bootstrap/style.css | 259 ++++++++++++++++++++++++++++ pages/nebula/index.html | 310 +-------------------------------- pages/nebula/script.js | 131 ++++++++++++++ pages/nebula/style.css | 157 +++++++++++++++++ 9 files changed, 651 insertions(+), 648 deletions(-) create mode 100644 pages/bootstrap/script.js create mode 100644 pages/bootstrap/style.css create mode 100644 pages/nebula/script.js create mode 100644 pages/nebula/style.css diff --git a/CHANGELOG.md b/CHANGELOG.md index 6f57a7c..ec95b6c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,18 @@ # 更新日志 +25w14a +--- +- PRE-RELEASE: 此版本是v2.3.0的预发布版本,请勿在生产环境中使用; +- CHANGE: 使用`touka-httpc`封装`HTTP Client`, 更新到`v0.2.0`版本, 参看`touka-httpc` +- CHANGE: 重构前端页面, 见[#49](https://github.com/WJQSERVER-STUDIO/ghproxy/pull/49) +- CHANGE: 重构`blacklist`实现 +- CHANGE: 优化404处理 +- CHANGE: 重构`whitelist`实现 +- CHANGE: 对`proxy`进行结构性调整 +- CHANGE: `chunckedreq`与`gitreq`共用`BufferPool`和`HTTP Client` +- CHANGE: 新增`HTTP Client`配置块 +- CHANGE: 加入内置主题配置, 支持通过配置切换主题 + 25w14t-2 --- - PRE-RELEASE: 此版本是测试验证版本,请勿在生产环境中使用; diff --git a/DEV-VERSION b/DEV-VERSION index b0f9cf0..678daff 100644 --- a/DEV-VERSION +++ b/DEV-VERSION @@ -1 +1 @@ -25w14t-2 \ No newline at end of file +25w14a \ No newline at end of file diff --git a/main.go b/main.go index 863caa6..cc2eecc 100644 --- a/main.go +++ b/main.go @@ -181,6 +181,8 @@ func init() { } 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) { diff --git a/pages/bootstrap/index.html b/pages/bootstrap/index.html index 066332a..b785d42 100644 --- a/pages/bootstrap/index.html +++ b/pages/bootstrap/index.html @@ -8,259 +8,7 @@ - + @@ -349,92 +97,7 @@
- + \ No newline at end of file diff --git a/pages/bootstrap/script.js b/pages/bootstrap/script.js new file mode 100644 index 0000000..a1c333e --- /dev/null +++ b/pages/bootstrap/script.js @@ -0,0 +1,84 @@ +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); \ No newline at end of file diff --git a/pages/bootstrap/style.css b/pages/bootstrap/style.css new file mode 100644 index 0000000..c6e7041 --- /dev/null +++ b/pages/bootstrap/style.css @@ -0,0 +1,259 @@ + /* 通用样式 */ + :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); + } + } \ No newline at end of file diff --git a/pages/nebula/index.html b/pages/nebula/index.html index 466700f..f01a39a 100644 --- a/pages/nebula/index.html +++ b/pages/nebula/index.html @@ -6,174 +6,15 @@ GitHub加速服务 - +
-

GitHub加速服务

高速稳定的 GitHub 资源访问解决方案

- -
@@ -201,8 +42,6 @@
- -
@@ -238,8 +77,6 @@
- -

📚 详细使用指南

@@ -253,7 +90,6 @@
  • ❌ 不支持 SSH Git Clone
    • -

    基础用法示例

    @@ -273,10 +109,8 @@ class="d-block">curl -LO https://example.com/https://github.com/user/project/releases/download/v1.0.0/project_1.0.0.amd64.tar.gz
    -

    支持的文件类型

    -
    @@ -285,14 +119,12 @@ class="d-block text-muted fs-sm">https://raw.githubusercontent.com/user/repo/main/file.txt
    -

    分支源码

    https://github.com/user/repo/archive/main.zip
    -

    版本发布

    @@ -300,7 +132,6 @@ class="d-block text-muted fs-sm">https://github.com/user/repo/releases/download/v1.0.0/app.zip
    -

    Gist 文件

    @@ -308,7 +139,6 @@ class="d-block text-muted fs-sm">https://gist.githubusercontent.com/user/gist_id/raw/file.txt
    -

    HTTPS Git Clone

    @@ -318,7 +148,6 @@
    -

    v

    Copyright © 2024 - WJQSERVER-STUDIO
    @@ -327,148 +156,13 @@

    - -
    - - + \ No newline at end of file diff --git a/pages/nebula/script.js b/pages/nebula/script.js new file mode 100644 index 0000000..4516f9c --- /dev/null +++ b/pages/nebula/script.js @@ -0,0 +1,131 @@ +(() => { + '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(); +})(); \ No newline at end of file diff --git a/pages/nebula/style.css b/pages/nebula/style.css new file mode 100644 index 0000000..81f40a8 --- /dev/null +++ b/pages/nebula/style.css @@ -0,0 +1,157 @@ +: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; +} \ No newline at end of file From f7ba0c28b4c2749b9c451416fdb82bb4165b11fe Mon Sep 17 00:00:00 2001 From: WJQSERVER Date: Tue, 18 Feb 2025 10:38:36 +0800 Subject: [PATCH 10/13] remove docker frontend & change to internel --- docker/dockerfile/dev/Dockerfile | 4 ---- docker/dockerfile/release/Dockerfile | 4 ---- 2 files changed, 8 deletions(-) diff --git a/docker/dockerfile/dev/Dockerfile b/docker/dockerfile/dev/Dockerfile index ff3a3d3..470ea48 100644 --- a/docker/dockerfile/dev/Dockerfile +++ b/docker/dockerfile/dev/Dockerfile @@ -15,10 +15,6 @@ RUN mkdir -p /data/${APPLICATION}/log # 安装依赖 RUN apk add --no-cache curl wget tar -# 前端 -RUN wget -O /data/www/index.html https://raw.githubusercontent.com/${USER}/${REPO}/dev/pages/index.html -RUN wget -O /data/www/favicon.ico https://raw.githubusercontent.com/${USER}/${REPO}/dev/pages/favicon.ico - # 后端 RUN VERSION=$(curl -s https://raw.githubusercontent.com/${USER}/${REPO}/dev/DEV-VERSION) && \ wget -O /data/${APPLICATION}/${APPLICATION}-${TARGETOS}-${TARGETARCH}.tar.gz https://github.com/${USER}/${REPO}/releases/download/$VERSION/${APPLICATION}-${TARGETOS}-${TARGETARCH}.tar.gz && \ diff --git a/docker/dockerfile/release/Dockerfile b/docker/dockerfile/release/Dockerfile index 411646e..0d960e0 100644 --- a/docker/dockerfile/release/Dockerfile +++ b/docker/dockerfile/release/Dockerfile @@ -15,10 +15,6 @@ RUN mkdir -p /data/${APPLICATION}/log # 安装依赖 RUN apk add --no-cache curl wget tar -# 前端 -RUN wget -O /data/www/index.html https://raw.githubusercontent.com/${USER}/${REPO}/main/pages/index.html -RUN wget -O /data/www/favicon.ico https://raw.githubusercontent.com/${USER}/${REPO}/main/pages/favicon.ico - # 后端 RUN VERSION=$(curl -s https://raw.githubusercontent.com/${USER}/${REPO}/main/VERSION) && \ wget -O /data/${APPLICATION}/${APPLICATION}-${TARGETOS}-${TARGETARCH}.tar.gz https://github.com/${USER}/${REPO}/releases/download/$VERSION/${APPLICATION}-${TARGETOS}-${TARGETARCH}.tar.gz && \ From 0faddce47413b0af018235902d41b6ef4b98ab05 Mon Sep 17 00:00:00 2001 From: WJQSERVER Date: Tue, 18 Feb 2025 11:59:43 +0800 Subject: [PATCH 11/13] change License to WJQserver Studio License 2.0 --- CHANGELOG.md | 5 ++ DEV-VERSION | 2 +- LICENSE | 214 ++++++++++++++++++++++++++++++++++++--------------- README.md | 4 +- 4 files changed, 161 insertions(+), 64 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index ec95b6c..9ee3fb8 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,10 @@ # 更新日志 +25w14b +--- +- PRE-RELEASE: 此版本是v2.3.0的预发布版本,请勿在生产环境中使用; +- CHANGE: 将许可证转为WJQserver Studio License 2.0 + 25w14a --- - PRE-RELEASE: 此版本是v2.3.0的预发布版本,请勿在生产环境中使用; diff --git a/DEV-VERSION b/DEV-VERSION index 678daff..3db6a63 100644 --- a/DEV-VERSION +++ b/DEV-VERSION @@ -1 +1 @@ -25w14a \ No newline at end of file +25w14b \ No newline at end of file diff --git a/LICENSE b/LICENSE index 477d35a..de09e5d 100644 --- a/LICENSE +++ b/LICENSE @@ -1,107 +1,197 @@ WJQserver Studio 开源许可证 -版本 1.2 +版本 v2.0 版权所有 © WJQserver Studio 2024 定义 -许可：指在本许可证内定义的使用、复制、分发与修改的条款与要求。 -授权方：指拥有版权的个人或组织，亦或是拥有版权的个人或组织所指派的实体。 -您：指行使本许可授予的权限的个人或法律实体。 -开源与自由软件 -本项目为开源软件，允许用户在遵循本许可证的前提下访问和使用源代码。 -本项目不等同于自由软件，使用权限受到本许可证条款的限制。 -强调版权所有，所有权利均由 WJQserver Studio 保留。 -许可证条款 -1. 使用权限 -1.1 您被授予在私人环境中自由使用本软件的权限。 -1.2 您可以在不修改关键声明的前提下进行商用。 +* 许可 (License): 指的是在本许可证内定义的使用、复制、分发与修改软件的条款与要求。 +* 授权方 (Licensor): 指的是拥有版权的个人或组织，亦或是拥有版权的个人或组织所指派的实体，在本许可证中特指 WJQserver Studio。 +* 贡献者 (Contributor): 指的是授权方以及根据本许可证授予贡献代码或软件的个人或实体。 +* 您 (You): 指的是行使本许可授予的权限的个人或法律实体。 +* 衍生作品 (Derivative Works): 指的是基于本软件或本软件任何部分的修改作品，无论修改程度如何。这包括但不限于基于本软件或其任何部分的修改、修订、改编、翻译或其他形式的创作，以及包含本软件或其部分的集合作品。 +* 非营利性使用 (Non-profit Use): 指的是不以直接商业盈利为主要目的的使用方式，包括但不限于： + * 个人用途： 由个人为了个人学习、研究、实验、非商业项目、个人网站搭建、毕业设计、家庭内部娱乐等非直接商业目的使用软件。 + * 教育用途： 在教育机构（如学校、大学、培训机构）内部用于教学、研究、学术交流等活动。 + * 科研用途： 在科研院所、实验室等机构内部用于科学研究、实验开发等活动。 + * 慈善与公益用途： 由慈善机构、公益组织等非营利性组织为了其公益使命或慈善事业内部运营使用，或对外提供不直接产生商业利润的公益服务。 + * 内部运营用途 (非营利组织)： 非营利性组织在其内部运营中使用软件，例如用于行政管理、会员管理、内部沟通、项目管理等非直接营利性活动。 + +开源与自由软件 + +本项目为开源软件，允许用户在遵循本许可证的前提下访问和使用源代码。 +本项目旨在向用户提供尽可能广泛的非商业使用自由，同时保障社区的共同发展和良性生态，并为商业创新提供清晰的路径。 +强调版权所有，所有权利由 WJQserver Studio 及贡献者共同保留。 + +许可证条款 + +1. 使用权限 + +* 1.1 非营利性使用： 您被授予在非营利性使用场景下，为了任何目的，自由使用本软件的权限。 非营利性使用的具体场景包括但不限于定义部分所列举的各种情况。 + +* 1.2 商业使用： 您可以在商业环境中使用本软件，无需获得额外授权，但您的商业使用行为必须遵守以下条款： + + * 1.2.1 保持声明： 您在进行商业使用时，不得移除或修改软件中包含的原始版权声明、许可证声明以及来源声明。 + * 1.2.2 开源继承 (Copyleft) 与互惠共享： 如果您或您的组织希望将本软件或其衍生作品用于任何商业用途，包括但不限于： + + * 盈利性分发： 销售、出租、许可分发本软件或其衍生作品。 + * 盈利性服务： 基于本软件或其衍生作品提供商业服务，例如 SaaS 服务、咨询服务、定制开发服务、收费技术支持服务等。 + * 嵌入式商业应用： 将本软件或其衍生作品嵌入到商业产品或解决方案中进行销售。 + * 组织内部商业运营： 在营利性组织的内部运营中使用修改后的版本以直接支持其商业活动，例如定制化内部系统，通过例如但不限于在软件或相关服务中投放广告 (例如 Google Ads 等)，应用内购买 (内购), 会员订阅， 增值功能收费等方式直接或间接产生商业收入。 + + 您必须选择以下两种方式之一： + + * i) 继承本许可证并开源： 您必须以本许可证或兼容的开源许可证分发您的衍生作品，并公开您的衍生作品的全部源代码，使得您的衍生作品的接收者也享有与您相同的权利，包括进一步修改和商业使用的权利。 本选项旨在促进社区的共同发展和知识共享，确保基于本软件的商业创新成果也能回馈社区。 + * ii) 获得授权方明确授权： 如果您不希望以开源方式发布您的衍生作品，或者希望使用其他许可证进行分发，或者您希望在商业运营中使用修改后的版本但不开源，您必须事先获得 WJQserver Studio 的明确书面授权。 授权的具体条款和条件将由 WJQserver Studio 另行协商确定。 2. 复制与分发 -2.1 您可以复制和分发本软件的原始版本，前提是必须保留所有版权声明和本许可证。 + +* 2.1 原始版本复制与分发： 您可以复制和分发本软件的原始版本，前提是必须满足以下条件： + + * 保留所有声明： 完整保留所有原始版权声明、许可证声明、来源声明以及其他所有权声明。 + * 附带许可证： 在分发软件时，必须同时附带本许可证的完整文本，确保接收者知悉并理解本许可证的全部条款。 + +* 2.2 衍生作品复制与分发： 您可以复制和分发基于本软件的衍生作品，您对衍生作品的分发行为将受到本许可证第 1.2.2 条（开源继承与互惠共享）的约束。 3. 修改权限 -3.1 您可以在非商业用途下修改本软件，前提是继承本许可证并保留原版权声明。 -3.2 禁止在修改后进行商业用途。 +* 3.1 自由修改： 您被授予自由修改本软件的权限，无论修改目的是非营利性使用还是商业用途。 -4. 专利引用 -4.1 若项目被专利相关引用，必须保留来源声明。 +* 3.2 修改后使用与分发约束： 当您将修改后的版本用于商业用途或分发修改后的版本时，您需要遵守本许可证第 1.2.2 条（开源继承与互惠共享）以及第 2 条（复制与分发）的规定。 即使您不分发修改后的版本，只要您将其用于商业目的，也需要遵守开源继承条款或获得授权。 -4.2 若为商业场景，需按照商用处理。 +* 3.3 贡献接受： WJQserver Studio 鼓励社区贡献代码。如果您向本项目贡献代码，您需要同意您的贡献代码按照本许可证条款进行许可。 + +4. 专利权 + +* 4.1 无专利担保，风险自担： 本软件以“现状”提供，授权方及贡献者明确声明，不对本软件的专利侵权问题做任何形式的担保，亦不承担任何因专利侵权可能产生的责任与后果。 用户理解并同意，使用本软件的专利风险完全由用户自行承担。 + +* 4.2 专利纠纷应对： 如因用户使用本软件而引发任何专利侵权指控、诉讼或索赔，用户应自行负责处理并承担全部法律责任。 授权方及贡献者无义务参与任何相关法律程序，亦不承担任何由此产生的费用或赔偿。 5. 免责声明 -5.1 本软件按“现状”提供，不提供任何明示或暗示的保证，包括但不限于适销性、特定用途适用性及非侵权性。 -5.2 在任何情况下，授权方均不对因使用或无法使用本软件而产生的任何直接、间接、偶然、特殊、惩罚性或后果性损害负责，即使已被告知可能发生此类损害。 +* 5.1 “现状”提供，无任何保证： 本软件按“现状”提供，不提供任何明示或暗示的保证，包括但不限于适销性、特定用途适用性及非侵权性。 -5.3 用户需根据当地法律对待本项目，确保遵守所有适用法规。 +* 5.2 责任限制： 在适用法律允许的最大范围内，在任何情况下，授权方或任何贡献者均不对因使用或无法使用本软件而产生的任何直接、间接、偶然、特殊、惩罚性或后果性损害（包括但不限于采购替代商品或服务；损失使用、数据或利润；或业务中断）负责，无论其是如何造成的，也无论依据何种责任理论，即使已被告知可能发生此类损害。 -6. 许可证期限 -6.1 本许可证自2024年开始生效，有效期暂为无限。 +* 5.3 用户法律责任： 用户需根据当地法律对待本项目，确保遵守所有适用法规。 -6.2 项目所有方有权修改许可证相关条例而不另行通知。 +6. 许可证期限与终止 -条款修订 -7.1 授权方保留随时修改本许可证条款的权利，以便更好地适应法律和技术的发展。 +* 6.1 许可证期限： 除版权所有人主动宣布放弃本软件版权外，本许可证无限期生效。 -7.2 修订后的条款将在发布时生效，继续使用本软件即表示接受修订后的条款。 +* 6.2 许可证终止： 如果您未能遵守本许可证的任何条款或条件，授权方有权终止本许可证。 您的许可证将在您违反本许可证条款时自动终止。 -其他 -8.1 本许可证不影响您作为最终用户的法定权利。 +* 6.3 终止后的效力： 许可证终止后，您根据本许可证所享有的所有权利将立即终止，但您在许可证终止前已合法分发的软件副本，其接收者所获得的许可及权利将不受影响，继续有效。 免责声明（第 5 条）和责任限制（第 5.2 条）在本许可证终止后仍然有效。 -8.2 若本许可证的某些条款被认定为不可执行，其余条款仍然有效。 +7. 条款修订 + +* 7.1 修订权利保留： 授权方保留随时修改本许可证条款的权利，以便更好地适应法律、技术发展以及社区需求。 + +* 7.2 修订生效与接受： 修订后的条款将在发布时生效，除非另行声明，否则继续使用、复制、分发或修改本软件即表示您接受修订后的条款。授权方鼓励用户定期查阅本许可证的最新版本。 + +8. 其他 + +* 8.1 法定权利： 本许可证不影响您作为最终用户在适用法律下的法定权利。 + +* 8.2 条款可分割性： 若本许可证的某些条款被认定为不可执行，其余条款仍然完全有效。 + +* 8.3 版本更新： 授权方可能会发布本许可证的修订版本或新版本。您可以选择是继续使用本许可证的旧版本还是选择适用新版本。 WJQserver Studio Open Source License -Version 1.2 +Version v2.0 Copyright © WJQserver Studio 2024 Definitions -License: The terms and conditions defined within this license for use, copying, distribution, and modification. -Licensor: The individual or organization holding the copyright, or the entity designated by them. -You: The individual or legal entity exercising the permissions granted by this license. -Open Source vs. Free Software -This project is open source, allowing users to access and use the source code under the terms of this license. -This project is not equivalent to free software; usage rights are restricted by this license. -Copyright is emphasized, with all rights reserved by WJQserver Studio. + +* License: Refers to the terms and requirements for use, reproduction, distribution, and modification defined within this license. +* Licensor: Refers to the individual or organization that holds the copyright, or the entity designated by the copyright holder, specifically WJQserver Studio in this license. +* Contributor: Refers to the Licensor and individuals or entities who contribute code or software under this License. +* You: Refers to the individual or legal entity exercising permissions granted by this License. +* Derivative Works: Refers to works modified based on the Software or any part thereof, regardless of the extent of modification. This includes but is not limited to modifications, revisions, adaptations, translations, or other forms of creation based on the Software or any part thereof, as well as collective works containing the Software or parts thereof. +* Non-profit Use: Refers to uses not primarily intended for direct commercial profit, including but not limited to: + * Personal Use: Use by an individual for personal learning, research, experimentation, non-commercial projects, personal website development, graduation projects, home entertainment, and other non-directly commercial purposes. + * Educational Use: Use within educational institutions (such as schools, universities, training organizations) for activities such as teaching, research, and academic exchange. + * Scientific Research Use: Use within scientific research institutions, laboratories, and similar organizations for activities such as scientific research and experimental development. + * Charitable and Public Welfare Use: Use by charitable organizations, public welfare organizations, and similar non-profit entities for their public missions or internal operation of charitable activities, or to provide public services that do not directly generate commercial profit. + * Internal Operational Use (Non-profit Organizations): Use within the internal operations of non-profit organizations, such as for administrative management, membership management, internal communication, project management, and other non-directly profit-generating activities. + +Open Source and Free Software + +This project is open-source software, allowing users to access and use the source code under the premise of complying with this License. +This project aims to provide users with the broadest possible freedom for non-commercial use while ensuring the common development and healthy ecosystem of the community, and providing a clear path for commercial innovation. +Copyright is emphasized; all rights are jointly reserved by WJQserver Studio and Contributors. + License Terms -1. Usage Rights -1.1 You are granted the right to use this software freely in a private environment. -1.2 You may use it commercially without modifying key statements. +1. Permissions for Use -2. Copying and Distribution -2.1 You may copy and distribute the original version of this software, provided all copyright notices and this license are retained. +* 1.1 Non-profit Use: You are granted permission to freely use the Software for any purpose in non-profit use scenarios. Specific non-profit use scenarios include but are not limited to the various situations listed in the Definition section. -3. Modification Rights -3.1 You may modify this software for non-commercial purposes, provided you inherit this license and retain the original copyright notice. +* 1.2 Commercial Use: You may use the Software in a commercial environment without additional authorization, but your commercial use must comply with the following terms: -3.2 Modifications cannot be used commercially. + * 1.2.1 Maintain Statements: When conducting commercial use, you must not remove or modify the original copyright notices, license notices, and source statements contained in the Software. + * 1.2.2 Open Source Inheritance (Copyleft) and Reciprocal Sharing: If you or your organization wish to use the Software or its Derivative Works for any commercial purpose, including but not limited to: -4. Patent References -4.1 If the project is cited in patent-related contexts, the source statement must be retained. + * Profit-generating Distribution: Selling, renting, licensing, or distributing the Software or its Derivative Works. + * Profit-generating Services: Providing commercial services based on the Software or its Derivative Works, such as SaaS services, consulting services, custom development services, and paid technical support services. + * Embedded Commercial Applications: Embedding the Software or its Derivative Works into commercial products or solutions for sale. + * Internal Commercial Operations: Using modified versions within the internal operations of for-profit organizations to directly support their commercial activities, such as customized internal systems, generating commercial revenue directly or indirectly through means including but not limited to placing advertisements in the software or related services (e.g., Google Ads), in-app purchases, membership subscriptions, and charging for value-added features. -4.2 For commercial scenarios, it must be treated as a commercial use. + You must choose one of the following two options: -5. Disclaimer -5.1 This software is provided "as is", without any express or implied warranties, including but not limited to merchantability, fitness for a particular purpose, and non-infringement. + * i) Inherit this License and Open Source: You must distribute your Derivative Works under this License or a compatible open-source license and publicly disclose the entire source code of your Derivative Works, so that recipients of your Derivative Works also enjoy the same rights as you, including the right to further modify and use commercially. This option aims to promote the common development and knowledge sharing of the community, ensuring that commercial innovation achievements based on this Software can also contribute back to the community. + * ii) Obtain Explicit Authorization from the Licensor: If you do not wish to release your Derivative Works in an open-source manner, or wish to distribute them under another license, or you wish to use a modified version in commercial operations without open-sourcing it, you must obtain explicit written authorization from WJQserver Studio in advance. The specific terms and conditions of authorization will be determined separately by WJQserver Studio through negotiation. -5.2 In no event shall the licensor be liable for any direct, indirect, incidental, special, punitive, or consequential damages arising out of the use or inability to use this software, even if advised of the possibility of such damages. +2. Reproduction and Distribution -5.3 Users must comply with all applicable laws regarding this project. +* 2.1 Reproduction and Distribution of Original Version: You may reproduce and distribute the original version of the Software, provided that the following conditions are met: -6. License Duration -6.1 This license is effective from 2024, with an indefinite duration. + * Retain All Statements: Completely retain all original copyright notices, license notices, source statements, and other proprietary notices. + * Accompany with License: When distributing the Software, you must also include the full text of this License to ensure that recipients are aware of and understand all terms of this License. -6.2 The project owner reserves the right to modify the license terms without prior notice. +* 2.2 Reproduction and Distribution of Derivative Works: You may reproduce and distribute Derivative Works based on the Software. Your distribution of Derivative Works will be subject to the constraints of Clause 1.2.2 of this License (Open Source Inheritance and Reciprocal Sharing). -Amendments -7.1 The licensor reserves the right to amend this license at any time to better adapt to legal and technological developments. +3. Modification Permissions -7.2 Revised terms become effective upon publication, and continued use of the software indicates acceptance of the revised terms. +* 3.1 Free Modification: You are granted permission to freely modify the Software, regardless of whether the purpose of modification is for non-profit use or commercial use. -Miscellaneous -8.1 This license does not affect your statutory rights as an end user. +* 3.2 Constraints on Use and Distribution after Modification: When you use a modified version for commercial purposes or distribute a modified version, you need to comply with the provisions of Clause 1.2.2 of this License (Open Source Inheritance and Reciprocal Sharing) and Clause 2 (Reproduction and Distribution). Even if you do not distribute the modified version, as long as you use it for commercial purposes, you also need to comply with the open-source inheritance clause or obtain authorization. -8.2 If any provision of this license is held to be unenforceable, the remaining provisions shall remain in effect. +* 3.3 Contribution Acceptance: WJQserver Studio encourages community contribution of code. If you contribute code to this project, you need to agree that your contributed code is licensed under the terms of this License. + +4. Patent Rights + +* 4.1 No Patent Warranty, Risk Self-Bearing: The software is provided “AS IS”, and the Licensor and Contributors explicitly declare that they do not provide any form of warranty regarding patent infringement issues of this software, nor do they assume any responsibility and consequences arising from patent infringement. Users understand and agree that the patent risk of using this software is entirely borne by the users themselves. + +* 4.2 Handling of Patent Disputes: If any patent infringement allegations, lawsuits, or claims arise due to the user's use of this Software, the user shall be solely responsible for handling and bear all legal liabilities. The Licensor and Contributors are under no obligation to participate in any related legal proceedings, nor do they bear any costs or compensation arising therefrom. + +5. Disclaimer of Warranty + +* 5.1 “AS IS” Provision, No Warranty: The software is provided “AS IS” without any express or implied warranties, including but not limited to warranties of merchantability, fitness for a particular purpose, and non-infringement. + +* 5.2 Limitation of Liability: To the maximum extent permitted by applicable law, in no event shall the Licensor or any Contributor be liable for any direct, indirect, incidental, special, punitive, or consequential damages (including but not limited to procurement of substitute goods or services; loss of use, data, or profits; or business interruption) however caused and on any theory of liability, whether in contract, strict liability, or tort (including negligence or otherwise) arising in any way out of the use of this software, even if advised of the possibility of such damage. + +* 5.3 User Legal Responsibility: Users shall treat this project in accordance with local laws and regulations to ensure compliance with all applicable laws and regulations. + +6. License Term and Termination + +* 6.1 License Term: Unless the copyright holder proactively announces the abandonment of the copyright of this software, this License shall be effective indefinitely from the date of your acceptance. + +* 6.2 License Termination: If you fail to comply with any terms or conditions of this License, the Licensor has the right to terminate this License. Your License will automatically terminate upon your violation of the terms of this License. + +* 6.3 Effect after Termination: Upon termination of the License, all rights granted to you under this License will terminate immediately, but the licenses and rights obtained by recipients of software copies you have legally distributed before the termination of the License will not be affected and will remain valid. The Disclaimer of Warranty (Clause 5) and Limitation of Liability (Clause 5.2) shall remain in effect after the termination of this License. + +7. Revision of Terms + +* 7.1 Reservation of Revision Rights: The Licensor reserves the right to modify the terms of this License at any time to better adapt to legal, technological developments, and community needs. + +* 7.2 Effectiveness and Acceptance of Revisions: Revised terms will take effect upon publication, and unless otherwise stated, continued use, reproduction, distribution, or modification of the Software indicates your acceptance of the revised terms. The Licensor encourages users to periodically review the latest version of this License. + +8. Other + +* 8.1 Statutory Rights: This License does not affect your statutory rights as an end-user under applicable laws. + +* 8.2 Severability of Terms: If certain terms of this License are deemed unenforceable, the remaining terms shall remain in full force and effect. + +* 8.3 Version Updates: The Licensor may publish revised versions or new versions of this License. You may choose to continue using the old version of this License or choose to apply the new version. diff --git a/README.md b/README.md index eb246b7..667e6ad 100644 --- a/README.md +++ b/README.md @@ -35,7 +35,9 @@ ### LICENSE -本项目使用WSL LICENSE Version1.2 (WJQSERVER STUDIO LICENSE Version1.2) +本项目使用WJQserver Studio License 2.0 [WJQserver Studio License 2.0](https://wjqserver-studio.github.io/LICENSE/LICENSE.html) + +在v2.3.0之前, 本项目使用WJQserver Studio License 1.2 在v1.0.0版本之前,本项目继承于[WJQSERVER-STUDIO/ghproxy-go](https://github.com/WJQSERVER-STUDIO/ghproxy-go)的APACHE2.0 LICENSE VERSION From 91cd76e541d60da76abf6ca104561c3c22871e30 Mon Sep 17 00:00:00 2001 From: wjqserver <114663932+WJQSERVER@users.noreply.github.com> Date: Wed, 19 Feb 2025 13:42:11 +0800 Subject: [PATCH 12/13] 2.3.0 --- CHANGELOG.md | 13 +++++++++++++ README.md | 11 ++++++----- VERSION | 2 +- deploy/install-dev.sh | 2 +- 4 files changed, 21 insertions(+), 7 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 9ee3fb8..9e27e49 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,18 @@ # 更新日志 +2.3.0 +--- +- CHANGE: 使用`touka-httpc`封装`HTTP Client`, 更新到`v0.2.0`版本, 参看`touka-httpc` +- CHANGE: 重构前端页面, 见[#49](https://github.com/WJQSERVER-STUDIO/ghproxy/pull/49) +- CHANGE: 重构`blacklist`实现 +- CHANGE: 优化404处理 +- CHANGE: 重构`whitelist`实现 +- CHANGE: 对`proxy`进行结构性调整 +- CHANGE: `chunckedreq`与`gitreq`共用`BufferPool`和`HTTP Client` +- CHANGE: 新增`HTTP Client`配置块 +- CHANGE: 加入内置主题配置, 支持通过配置切换主题 +- CHANGE: 将许可证转为WJQserver Studio License 2.0 + 25w14b --- - PRE-RELEASE: 此版本是v2.3.0的预发布版本,请勿在生产环境中使用; diff --git a/README.md b/README.md index 667e6ad..b68d9a8 100644 --- a/README.md +++ b/README.md @@ -16,7 +16,9 @@ ### 项目特点 -- 基于Go语言实现,使用[Gin框架](https://github.com/gin-gonic/gin) +- 基于Go语言实现,支持多平台 +- 使用[Gin](https://github.com/gin-gonic/gin)作为Web框架 +- 使用[Touka-HTTPC](https://github.com/satomitouka/touka-httpc)作为HTTP客户端 - 支持Git clone,raw,realeases等文件拉取 - 支持Docker部署 - 支持速率限制 @@ -146,6 +148,7 @@ url = "socks5://127.0.0.1:1080" # "http://127.0.0.1:7890" 支持Socks5/HTTP(S) "test/test1", "example/repo2", "another/*" + "another" ] } ``` @@ -160,6 +163,7 @@ url = "socks5://127.0.0.1:1080" # "http://127.0.0.1:7890" 支持Socks5/HTTP(S) "test/test1", "example/repo2", "another/*" + "another" ] } ``` @@ -168,10 +172,7 @@ url = "socks5://127.0.0.1:1080" # "http://127.0.0.1:7890" 支持Socks5/HTTP(S) ```Caddyfile example.com { - reverse_proxy { - to 127.0.0.1:7210 - } - encode zstd gzip + reverse_proxy * 127.0.0.1:7210 } ``` diff --git a/VERSION b/VERSION index e3a4f19..cc6612c 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -2.2.0 \ No newline at end of file +2.3.0 \ No newline at end of file diff --git a/deploy/install-dev.sh b/deploy/install-dev.sh index e412c46..24c8cf0 100644 --- a/deploy/install-dev.sh +++ b/deploy/install-dev.sh @@ -90,7 +90,7 @@ tar -zxvf ${ghproxy_dir}/ghproxy-linux-$ARCH.tar.gz -C ${ghproxy_dir} chmod +x ${ghproxy_dir}/ghproxy # 下载pages -wget -q -O ${ghproxy_dir}/pages/index.html https://raw.githubusercontent.com/WJQSERVER-STUDIO/ghproxy/dev/pages/boostrap/index.html +wget -q -O ${ghproxy_dir}/pages/index.html https://raw.githubusercontent.com/WJQSERVER-STUDIO/ghproxy/dev/pages/bootstrap/index.html wget -q -O ${ghproxy_dir}/pages/favicon.ico https://raw.githubusercontent.com/WJQSERVER-STUDIO/ghproxy/dev/pages/bootstrap/favicon.ico From 19cd77afd2e861ca3f5e9dc251955a6a43136a4f Mon Sep 17 00:00:00 2001 From: wjqserver <114663932+WJQSERVER@users.noreply.github.com> Date: Wed, 19 Feb 2025 16:07:21 +0800 Subject: [PATCH 13/13] update readme.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index b68d9a8..6383e64 100644 --- a/README.md +++ b/README.md @@ -102,7 +102,7 @@ maxIdleConnsPerHost = 60 # only for advanced mode 仅用于高级模式 maxConnsPerHost = 0 # only for advanced mode 仅用于高级模式 [pages] -enabled = false # 是否开启内置静态页面(Docker版本请关闭此项) +enabled = false # 是否开启外置静态页面(Docker版本请关闭此项) theme = "bootstrap" # "bootstrap" or "nebula" 内置主题 staticPath = "/data/www" # 静态页面文件路径