From b04d62a178f60af630974812dd5359fe94cd32b3 Mon Sep 17 00:00:00 2001
From: seaHi <me@seahi.me>
Date: Fri, 14 Aug 2026 18:27:49 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E8=87=AA=E5=8A=A8=E5=8E=BB=E9=99=A4=20R?=
 =?UTF-8?q?2=20=E8=87=AA=E5=AE=9A=E4=B9=89=E5=9F=9F=E5=90=8D=E6=9C=AB?=
 =?UTF-8?q?=E5=B0=BE=E7=9A=84=E6=96=9C=E6=9D=A0=E5=B9=B6=E7=B2=BE=E7=AE=80?=
 =?UTF-8?q?=E8=A1=A8=E5=8D=95=E6=8F=90=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/routes/admin/settings/+page.server.ts | 4 +++-
 src/routes/admin/settings/+page.svelte    | 7 ++++---
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/src/routes/admin/settings/+page.server.ts b/src/routes/admin/settings/+page.server.ts
index 5122f92..f4d4322 100644
--- a/src/routes/admin/settings/+page.server.ts
+++ b/src/routes/admin/settings/+page.server.ts
@@ -41,7 +41,9 @@ export const actions: Actions = {
 			},
 			{
 				key: 'r2.public_domain',
-				value: data.get('r2_public_domain')?.toString() || 'https://assets.yourdomain.com'
+				value: (
+					data.get('r2_public_domain')?.toString() || 'https://assets.yourdomain.com'
+				).replace(/\/+$/, '')
 			},
 			{
 				key: 'site.launch_date',
diff --git a/src/routes/admin/settings/+page.svelte b/src/routes/admin/settings/+page.svelte
index 09a6bac..bd06aee 100644
--- a/src/routes/admin/settings/+page.svelte
+++ b/src/routes/admin/settings/+page.svelte
@@ -74,8 +74,11 @@
 							required
 						/>
 					</div>
+				</div>
+
+				<div class="form-row">
 					<div class="form-group">
-						<label for="r2_public_domain">R2 自定义域名 (用于访问附件)</label>
+						<label for="r2_public_domain">R2 自定义域名</label>
 						<input
 							type="text"
 							id="r2_public_domain"
@@ -83,7 +86,6 @@
 							value={data.settings['r2.public_domain'] || 'https://assets.yourdomain.com'}
 							placeholder="例如: https://assets.mydomain.com"
 						/>
-						<small class="form-hint">请确保不要以斜杠 / 结尾</small>
 					</div>
 					<div class="form-group">
 						<label for="site_launch_date">建站日期</label>
@@ -92,7 +94,6 @@
 							name="site_launch_date"
 							value={data.settings['site.launch_date'] || ''}
 						/>
-						<small class="form-hint">用于在底栏显示"感谢陪伴 X 天 X 小时"</small>
 					</div>
 				</div>