From ddd12729a41cc17951e35bb99229ab0b2a623da7 Mon Sep 17 00:00:00 2001 From: WJQSERVER Date: Sun, 20 Oct 2024 18:56:37 +0800 Subject: [PATCH] 24w18f --- CHANGELOG.md | 6 ++++++ DEV-VERSION | 2 +- README.md | 2 +- deploy/config.toml | 2 +- deploy/install-dev.sh | 15 ++++++++------- pages/index.html | 10 +++++----- 6 files changed, 22 insertions(+), 15 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 6cc6ea8..0e17a2f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,11 @@ # 更新日志 +24w18f +--- +- PRE-RELEASE: 此版本是预发布版本,请勿在生产环境中使用 +- CHANGE: 修正前端页面的部分样式问题 +- FIX: 修正部分问题 + 24w18e --- - PRE-RELEASE: 此版本是预发布版本,请勿在生产环境中使用 diff --git a/DEV-VERSION b/DEV-VERSION index 164704b..430b82d 100644 --- a/DEV-VERSION +++ b/DEV-VERSION @@ -1 +1 @@ -24w18e \ No newline at end of file +24w18f \ No newline at end of file diff --git a/README.md b/README.md index d7fe435..f15824d 100644 --- a/README.md +++ b/README.md @@ -81,7 +81,7 @@ host = "127.0.0.1" # 监听地址 port = 8080 # 监听端口 sizeLimit = 131072000 # 125MB -[page] +[pages] enabled = true # 是否开启内置静态页面 staticPath = "/data/www" # 静态页面文件路径 diff --git a/deploy/config.toml b/deploy/config.toml index 11a64b6..4ffbd54 100644 --- a/deploy/config.toml +++ b/deploy/config.toml @@ -3,7 +3,7 @@ host = "127.0.0.1" port = 8080 sizeLimit = 131072000 # 125MB -[page] +[pages] enabled = true staticDir = "/root/data/ghproxy/pages" diff --git a/deploy/install-dev.sh b/deploy/install-dev.sh index 15b68d7..50c18a8 100644 --- a/deploy/install-dev.sh +++ b/deploy/install-dev.sh @@ -57,30 +57,31 @@ mkdir -p /root/data/ghproxy/pages # 获取最新版本号 VERSION=$(curl -s https://raw.githubusercontent.com/WJQSERVER-STUDIO/ghproxy/main/DEV-VERSION) -wget -O /root/data/ghproxy/VERSION https://raw.githubusercontent.com/WJQSERVER-STUDIO/ghproxy/main/DEV-VERSION +wget -q -O /root/data/ghproxy/VERSION https://raw.githubusercontent.com/WJQSERVER-STUDIO/ghproxy/main/DEV-VERSION # 下载ghproxy -wget -O /root/data/ghproxy/ghproxy https://github.com/WJQSERVER-STUDIO/ghproxy/releases/download/$VERSION/ghproxy-linux-$ARCH +wget -q -O /root/data/ghproxy/ghproxy https://github.com/WJQSERVER-STUDIO/ghproxy/releases/download/$VERSION/ghproxy-linux-$ARCH chmod +x /root/data/ghproxy/ghproxy # 下载pages -wget -O /root/data/ghproxy/pages/index.html https://raw.githubusercontent.com/WJQSERVER-STUDIO/ghproxy/main/pages/index.html -wget -O /root/data/ghproxy/pages/favicon.ico https://raw.githubusercontent.com/WJQSERVER-STUDIO/ghproxy/main/pages/favicon.ico +wget -q -O /root/data/ghproxy/pages/index.html https://raw.githubusercontent.com/WJQSERVER-STUDIO/ghproxy/main/pages/index.html +wget -q -O /root/data/ghproxy/pages/favicon.ico https://raw.githubusercontent.com/WJQSERVER-STUDIO/ghproxy/main/pages/favicon.ico # 下载配置文件 if [ -f /root/data/ghproxy/config/config.toml ]; then echo "配置文件已存在, 跳过下载" - echo "请检查配置文件是否正确，DEV版本升级时请注意配置文件兼容性" + echo "[WARNING] 请检查配置文件是否正确，DEV版本升级时请注意配置文件兼容性" + sleep 2 else - wget -O /root/data/ghproxy/config/config.toml https://raw.githubusercontent.com/WJQSERVER-STUDIO/ghproxy/main/deploy/config.toml + wget -q -O /root/data/ghproxy/config/config.toml https://raw.githubusercontent.com/WJQSERVER-STUDIO/ghproxy/main/deploy/config.toml fi # 替换 port = 8080 sed -i "s/port = 8080/port = $PORT/g" /root/data/ghproxy/config/config.toml # 下载systemd服务文件 -wget -O /etc/systemd/system/ghproxy.service https://raw.githubusercontent.com/WJQSERVER-STUDIO/ghproxy/main/deploy/ghproxy.service +wget -q -O /etc/systemd/system/ghproxy.service https://raw.githubusercontent.com/WJQSERVER-STUDIO/ghproxy/main/deploy/ghproxy.service # 启动ghproxy systemctl daemon-reload diff --git a/pages/index.html b/pages/index.html index f03fd4b..3b69dd3 100644 --- a/pages/index.html +++ b/pages/index.html @@ -10,7 +10,7 @@