From 9f801bbac8ffd13fe94fde7c063949c149e3eea1 Mon Sep 17 00:00:00 2001 From: WJQSERVER Date: Wed, 2 Oct 2024 21:44:33 +0800 Subject: [PATCH] v1.1.1 --- CHANGELOG.md | 12 ++++++++++++ DEV-VERSION | 2 +- VERSION | 2 +- caddyfile/dev/Caddyfile | 10 +++++----- caddyfile/release/Caddyfile | 10 +++++----- 5 files changed, 24 insertions(+), 12 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 6f27242..fbc579c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,17 @@ # 更新日志 +v1.1.1 +--- +- CHANGE: 修改部分代码，与golang-temp项目定义的开发规范保持一致 +- CHANGE: 更新Go版本至v1.23.2 +- CHANGE: 跟随Caddy更新,修改Caddyfile配置 + +24w07b +--- +- CHANGE: 修改部分代码，与golang-temp项目定义的开发规范保持一致 +- CHANGE: 更新Go版本至v1.23.2 +- CHANGE: 跟随Caddy更新,修改Caddyfile配置 + 24w07a --- - CHANGE: 修改部分代码，与golang-temp项目定义的开发规范保持一致 diff --git a/DEV-VERSION b/DEV-VERSION index ec3e49f..f77aa1b 100644 --- a/DEV-VERSION +++ b/DEV-VERSION @@ -1 +1 @@ -24w07a \ No newline at end of file +24w07b \ No newline at end of file diff --git a/VERSION b/VERSION index 1cc5f65..8cfbc90 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -1.1.0 \ No newline at end of file +1.1.1 \ No newline at end of file diff --git a/caddyfile/dev/Caddyfile b/caddyfile/dev/Caddyfile index b4e87f9..3817e34 100644 --- a/caddyfile/dev/Caddyfile +++ b/caddyfile/dev/Caddyfile @@ -4,7 +4,7 @@ https_port 443 order cache before rewrite cache { - cache_name W-Cache + cache_name GhProxyCache } log { level INFO @@ -20,7 +20,7 @@ format transform `{request>headers>X-Forwarded-For>[0]:request>remote_ip} - {user_id} [{ts}] "{request>method} {request>uri} {request>proto}" {status} {size} "{request>headers>Referer>[0]}" "{request>headers>User-Agent>[0]}"` { time_format "02/Jan/2006:15:04:05 -0700" } - output file /data/caddy/log/{args.0}/access.log { + output file /data/caddy/log/{args[0]}/access.log { roll_size 5MB roll_keep 10 roll_keep_for 24h @@ -48,8 +48,8 @@ (cache) { cache { allowed_http_verbs GET - stale {args.0} - ttl {args.1} + stale {args[0]} + ttl {args[1]} } } @@ -68,7 +68,7 @@ (rate_limit) { route /* { - rate_limit {remote.ip} {args.0}r/m 10000 429 + rate_limit {remote.ip} {args[0]}r/m 10000 429 } } diff --git a/caddyfile/release/Caddyfile b/caddyfile/release/Caddyfile index 7b12f52..2fb34f4 100644 --- a/caddyfile/release/Caddyfile +++ b/caddyfile/release/Caddyfile @@ -4,7 +4,7 @@ https_port 443 order cache before rewrite cache { - cache_name W-Cache + cache_name GhProxyCache } log { level INFO @@ -20,7 +20,7 @@ format transform `{request>headers>X-Forwarded-For>[0]:request>remote_ip} - {user_id} [{ts}] "{request>method} {request>uri} {request>proto}" {status} {size} "{request>headers>Referer>[0]}" "{request>headers>User-Agent>[0]}"` { time_format "02/Jan/2006:15:04:05 -0700" } - output file /data/caddy/log/{args.0}/access.log { + output file /data/caddy/log/{args[0]}/access.log { roll_size 5MB roll_keep 10 roll_keep_for 24h @@ -48,8 +48,8 @@ (cache) { cache { allowed_http_verbs GET - stale {args.0} - ttl {args.1} + stale {args[0]} + ttl {args[1]} } } @@ -68,7 +68,7 @@ (rate_limit) { route /* { - rate_limit {remote.ip} {args.0}r/m 10000 429 + rate_limit {remote.ip} {args[0]}r/m 10000 429 } }