From 0ab01a9b83fce2871592c97f9b05aa8ff154ceca Mon Sep 17 00:00:00 2001
From: WJQSERVER <wjqserver@outlook.com>
Date: Fri, 8 Nov 2024 12:14:04 +0800
Subject: [PATCH] 1.7.1

---
 CHANGELOG.md                         | 9 +++++++++
 VERSION                              | 2 +-
 docker/dockerfile/dev/init.sh        | 4 ++--
 docker/dockerfile/release/Dockerfile | 2 ++
 docker/dockerfile/release/init.sh    | 8 ++++++--
 main.go                              | 2 +-
 6 files changed, 21 insertions(+), 6 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index aaf276b..9be95ab 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,14 @@
 # 更新日志
 
+v1.7.1
+---
+- CHANGE: 更新Go版本至1.23.3
+- CHANGE: 更新相关依赖库
+- ADD: 对`Proxy`模块进行优化,增加使用`HEAD`方式预获取`Content-Length`头
+- CHANGE: 将`release`与`dev`版本的底包切换至`wjqserver/caddy:2.9.0-rc4-alpine`，将`nocache`版本的底包切换至`alpine:latest`
+- CHANGE: 对`nocache`版本的`config.toml`与`init.sh`进行适配性修改
+- CHANGE: 加入测试性的故障熔断机制(Failure Circuit Breaker) (nocache版本暂不支持)
+
 24w22b
 ---
 - PRE-RELEASE: 此版本是v1.7.1的预发布版本,请勿在生产环境中使用
diff --git a/VERSION b/VERSION
index 9dbb0c0..081af9a 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-1.7.0
\ No newline at end of file
+1.7.1
\ No newline at end of file
diff --git a/docker/dockerfile/dev/init.sh b/docker/dockerfile/dev/init.sh
index c65df4a..262164c 100644
--- a/docker/dockerfile/dev/init.sh
+++ b/docker/dockerfile/dev/init.sh
@@ -25,7 +25,7 @@ fi
 sleep 30
 
 while [[ true ]]; do
-    # 健康检查
-    curl -f http://localhost:8080/api/healthcheck || exit 1
+    # Failure Circuit Breaker
+    curl -f -max-time 5 -retry 3 http://localhost:8080/api/healthcheck || exit 1
     sleep 120
 done    
\ No newline at end of file
diff --git a/docker/dockerfile/release/Dockerfile b/docker/dockerfile/release/Dockerfile
index bf168f0..8818b62 100644
--- a/docker/dockerfile/release/Dockerfile
+++ b/docker/dockerfile/release/Dockerfile
@@ -38,6 +38,8 @@ RUN chmod +x /usr/local/bin/init.sh
 
 FROM wjqserver/caddy:2.9.0-rc4-alpine
 
+RUN apk add --no-cache curl
+
 COPY --from=builder /data/www /data/www
 COPY --from=builder /data/caddy /data/caddy
 COPY --from=builder /data/${APPLICATION} /data/${APPLICATION}
diff --git a/docker/dockerfile/release/init.sh b/docker/dockerfile/release/init.sh
index 34d3477..67058de 100644
--- a/docker/dockerfile/release/init.sh
+++ b/docker/dockerfile/release/init.sh
@@ -22,6 +22,10 @@ fi
 
 /data/${APPLICATION}/${APPLICATION} -cfg /data/${APPLICATION}/config/config.toml > /data/${APPLICATION}/log/run.log 2>&1 &
 
-while true; do
-    sleep 1
+sleep 30
+
+while [[ true ]]; do
+    # Failure Circuit Breaker
+    curl -f -max-time 5 -retry 3 http://localhost:8080/api/healthcheck || exit 1
+    sleep 120
 done
\ No newline at end of file
diff --git a/main.go b/main.go
index 3671b72..ef0d301 100644
--- a/main.go
+++ b/main.go
@@ -113,6 +113,6 @@ func main() {
 	if err != nil {
 		logError("Failed to start server: %v\n", err)
 	}
-
+	defer logger.Close()
 	fmt.Println("Program Exit")
 }