From 1eed79463d559c8822fb0ff35de85b733a9e37b6 Mon Sep 17 00:00:00 2001 From: WJQSERVER Date: Fri, 1 Nov 2024 04:12:28 +0800 Subject: [PATCH] 24w21a --- CHANGELOG.md | 1 + docker/dockerfile/dev/Dockerfile | 4 ++-- main.go | 1 + 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 05db439..d3812f2 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,7 @@ - PRE-RELEASE: 此版本是v1.7.0的预发布版本,请勿在生产环境中使用 - ADD: 尝试加入程序内置速率限制 - CHANGE: 更新相关依赖库 +- CHANGE: 更换Dev版本底包,于release版本保持一致 v1.6.2 --- diff --git a/docker/dockerfile/dev/Dockerfile b/docker/dockerfile/dev/Dockerfile index ec9fac4..7f462ea 100644 --- a/docker/dockerfile/dev/Dockerfile +++ b/docker/dockerfile/dev/Dockerfile @@ -1,4 +1,4 @@ -FROM wjqserver/caddy:daily-alpine AS builder +FROM wjqserver/caddy:2.9.0-rc-alpine AS builder ARG USER=WJQSERVER-STUDIO ARG REPO=ghproxy @@ -34,7 +34,7 @@ RUN wget -O /data/${APPLICATION}/whitelist.json https://raw.githubusercontent.co RUN chmod +x /data/${APPLICATION}/${APPLICATION} RUN chmod +x /usr/local/bin/init.sh -FROM wjqserver/caddy:daily-alpine +FROM wjqserver/caddy:2.9.0-rc-alpine COPY --from=builder /data/www /data/www COPY --from=builder /data/caddy /data/caddy diff --git a/main.go b/main.go index 0874c21..98f7391 100644 --- a/main.go +++ b/main.go @@ -78,6 +78,7 @@ func init() { loadConfig() setupLogger(cfg) loadlist(cfg) + setupRateLimit(cfg) gin.SetMode(gin.ReleaseMode)