Fix production SEO site URLs for website deployment (#5)

Author: wanghe-fit2cloud

.github/workflows/astro.yml

@@ -26,6 +26,7 @@ concurrency:
 
 env:
   BUILD_PATH: "." # default value when not using subfolders
+  PRODUCTION_SITE_URL: "https://1panel.cn"
   # BUILD_PATH: subfolder
 
 jobs:
@@ -77,6 +78,18 @@ jobs:
         uses: actions/upload-pages-artifact@v3
         with:
           path: ${{ env.BUILD_PATH }}/dist
+      - name: Build production artifact for 1panel.cn
+        run: |
+          rm -rf dist
+          ${{ steps.detect-package-manager.outputs.runner }} astro build \
+            --site "${{ env.PRODUCTION_SITE_URL }}" \
+            --base "./"
+        working-directory: ${{ env.BUILD_PATH }}
+      - name: Upload production artifact
+        uses: actions/upload-artifact@v4
+        with:
+          name: production-site-dist
+          path: ${{ env.BUILD_PATH }}/dist
 
   deploy:
     environment:
@@ -105,17 +118,14 @@ jobs:
       - name: Download build artifact
         uses: actions/download-artifact@v4
         with:
-          name: github-pages
+          name: production-site-dist
           path: dist
 
       - name: Copy build output to website-2026/1panel
         run: |
           rm -rf website-2026/1panel
           mkdir -p website-2026/1panel
-          cd dist
-          tar -xvf artifact.tar
-          rm -rf artifact.tar
-          cp -r ./* ../website-2026/1panel/
+          cp -r dist/. website-2026/1panel/
 
       - name: Configure Git
         run: |

src/layouts/Layout.astro

@@ -37,9 +37,9 @@ const {
   structuredData = [],
 } = Astro.props;
 
-const siteUrl = Astro.site ?? new URL(SITE_URL);
+const siteUrl = (Astro.site ?? new URL(SITE_URL)).toString();
 const canonicalUrl = new URL(canonical ?? Astro.url.pathname, siteUrl).toString();
-const socialImageUrl = toAbsoluteUrl(image, siteUrl.toString());
+const socialImageUrl = toAbsoluteUrl(image, siteUrl);
 const keywordsContent = Array.isArray(keywords) ? keywords.join(",") : keywords;
 const robotsContent = noindex
   ? "noindex, nofollow"
@@ -49,13 +49,14 @@ const extraStructuredData = Array.isArray(structuredData)
   ? structuredData
   : [structuredData];
 const structuredDataItems = [
-  createOrganizationSchema(),
+  createOrganizationSchema(siteUrl),
   createWebPageSchema({
     title: schemaName,
     description,
     url: canonicalUrl,
+    siteUrl,
   }),
-  ...(isHomePage ? [createWebsiteSchema()] : []),
+  ...(isHomePage ? [createWebsiteSchema(siteUrl)] : []),
   ...extraStructuredData.filter(Boolean),
 ];
 ---

src/lib/seo.ts

@@ -24,35 +24,43 @@ export const DEFAULT_KEYWORDS = [
 ];
 export const DEFAULT_OG_IMAGE = "/images/overview-full.png";
 
+function normalizeSiteUrl(siteUrl: string = SITE_URL) {
+  return new URL("/", siteUrl).toString().replace(/\/$/, "");
+}
+
 export function toAbsoluteUrl(path: string, base: string = SITE_URL) {
-  return new URL(path, base).toString();
+  return new URL(path, normalizeSiteUrl(base)).toString();
 }
 
-export function createOrganizationSchema(): StructuredData {
+export function createOrganizationSchema(siteUrl: string = SITE_URL): StructuredData {
+  const resolvedSiteUrl = normalizeSiteUrl(siteUrl);
+
   return {
     "@context": "https://schema.org",
     "@type": "Organization",
-    "@id": `${SITE_URL}/#organization`,
+    "@id": `${resolvedSiteUrl}/#organization`,
     name: ORGANIZATION_NAME,
     alternateName: ORGANIZATION_ALTERNATE_NAME,
     url: ORGANIZATION_URL,
-    logo: toAbsoluteUrl("/images/logo-light-FIT2CLOUD.svg"),
+    logo: toAbsoluteUrl("/images/logo-light-FIT2CLOUD.svg", resolvedSiteUrl),
     sameAs: [ORGANIZATION_URL],
   };
 }
 
-export function createWebsiteSchema(): StructuredData {
+export function createWebsiteSchema(siteUrl: string = SITE_URL): StructuredData {
+  const resolvedSiteUrl = normalizeSiteUrl(siteUrl);
+
   return {
     "@context": "https://schema.org",
     "@type": "WebSite",
-    "@id": `${SITE_URL}/#website`,
+    "@id": `${resolvedSiteUrl}/#website`,
     name: `${SITE_NAME} 官网`,
     alternateName: SITE_NAME,
-    url: `${SITE_URL}/`,
+    url: `${resolvedSiteUrl}/`,
     inLanguage: "zh-CN",
     description: DEFAULT_DESCRIPTION,
     publisher: {
-      "@id": `${SITE_URL}/#organization`,
+      "@id": `${resolvedSiteUrl}/#organization`,
     },
   };
 }
@@ -61,11 +69,15 @@ export function createWebPageSchema({
   title,
   description,
   url,
+  siteUrl = SITE_URL,
 }: {
   title: string;
   description: string;
   url: string;
+  siteUrl?: string;
 }): StructuredData {
+  const resolvedSiteUrl = normalizeSiteUrl(siteUrl);
+
   return {
     "@context": "https://schema.org",
     "@type": "WebPage",
@@ -75,40 +87,42 @@ export function createWebPageSchema({
     description,
     inLanguage: "zh-CN",
     isPartOf: {
-      "@id": `${SITE_URL}/#website`,
+      "@id": `${resolvedSiteUrl}/#website`,
     },
     about: {
       "@type": "Thing",
       name: SITE_NAME,
     },
     publisher: {
-      "@id": `${SITE_URL}/#organization`,
+      "@id": `${resolvedSiteUrl}/#organization`,
     },
   };
 }
 
-export function createSoftwareApplicationSchema(): StructuredData {
+export function createSoftwareApplicationSchema(siteUrl: string = SITE_URL): StructuredData {
+  const resolvedSiteUrl = normalizeSiteUrl(siteUrl);
+
   return {
     "@context": "https://schema.org",
     "@type": "SoftwareApplication",
-    "@id": `${SITE_URL}/#software`,
+    "@id": `${resolvedSiteUrl}/#software`,
     name: SITE_NAME,
-    url: `${SITE_URL}/`,
+    url: `${resolvedSiteUrl}/`,
     description: DEFAULT_DESCRIPTION,
     applicationCategory: "DeveloperApplication",
     operatingSystem: "Linux",
-    image: toAbsoluteUrl(DEFAULT_OG_IMAGE),
-    screenshot: toAbsoluteUrl("/images/dashboard-preview.png"),
+    image: toAbsoluteUrl(DEFAULT_OG_IMAGE, resolvedSiteUrl),
+    screenshot: toAbsoluteUrl("/images/dashboard-preview.png", resolvedSiteUrl),
     downloadUrl: GITHUB_URL,
-    softwareHelp: toAbsoluteUrl("/docs"),
+    softwareHelp: toAbsoluteUrl("/docs", resolvedSiteUrl),
     isAccessibleForFree: true,
     offers: {
       "@type": "Offer",
       price: "0",
       priceCurrency: "CNY",
     },
     publisher: {
-      "@id": `${SITE_URL}/#organization`,
+      "@id": `${resolvedSiteUrl}/#organization`,
     },
     sameAs: [GITHUB_URL],
     featureList: [

src/pages/about.astro

@@ -7,8 +7,11 @@ import LanguageModal from "../components/LanguageModal.astro";
 import {
   SITE_URL,
   createBreadcrumbSchema,
+  toAbsoluteUrl,
 } from "../lib/seo";
 import "../styles/global.css";
+
+const siteUrl = Astro.site?.toString() ?? SITE_URL;
 ---
 
 <Layout
@@ -27,8 +30,8 @@ import "../styles/global.css";
   ]}
   structuredData={[
     createBreadcrumbSchema([
-      { name: "1Panel 官网", url: `${SITE_URL}/` },
-      { name: "关于 1Panel", url: `${SITE_URL}/about.html` },
+      { name: "1Panel 官网", url: toAbsoluteUrl("/", siteUrl) },
+      { name: "关于 1Panel", url: toAbsoluteUrl("/about.html", siteUrl) },
     ]),
   ]}
 >

src/pages/index.astro

@@ -12,9 +12,12 @@ import CTA from '../components/CTA.astro';
 import Footer from '../components/Footer.astro';
 import LanguageModal from '../components/LanguageModal.astro';
 import {
+  SITE_URL,
   createSoftwareApplicationSchema,
 } from '../lib/seo';
 import '../styles/global.css';
+
+const siteUrl = Astro.site?.toString() ?? SITE_URL;
 ---
 
 <Layout
@@ -35,7 +38,7 @@ import '../styles/global.css';
     "数据库管理",
     "AI 模型管理",
   ]}
-  structuredData={[createSoftwareApplicationSchema()]}
+  structuredData={[createSoftwareApplicationSchema(siteUrl)]}
 >
   <Statistics slot="head" />
   <Fragment slot="main">

src/pages/openclaw.astro

@@ -7,8 +7,11 @@ import { Icon } from 'astro-icon/components'
 import {
   SITE_URL,
   createBreadcrumbSchema,
+  toAbsoluteUrl,
 } from "../lib/seo";
 import "../styles/global.css";
+
+const siteUrl = Astro.site?.toString() ?? SITE_URL;
 ---
 
 <Layout
@@ -27,8 +30,8 @@ import "../styles/global.css";
   ]}
   structuredData={[
     createBreadcrumbSchema([
-      { name: "1Panel 官网", url: `${SITE_URL}/` },
-      { name: "OpenClaw 一体机", url: `${SITE_URL}/openclaw.html` },
+      { name: "1Panel 官网", url: toAbsoluteUrl("/", siteUrl) },
+      { name: "OpenClaw 一体机", url: toAbsoluteUrl("/openclaw.html", siteUrl) },
     ]),
   ]}
 >

src/pages/self-hosted.astro

@@ -7,8 +7,11 @@ import LanguageModal from "../components/LanguageModal.astro";
 import {
   SITE_URL,
   createBreadcrumbSchema,
+  toAbsoluteUrl,
 } from "../lib/seo";
 import "../styles/global.css";
+
+const siteUrl = Astro.site?.toString() ?? SITE_URL;
 ---
 
 <Layout
@@ -25,8 +28,8 @@ import "../styles/global.css";
   ]}
   structuredData={[
     createBreadcrumbSchema([
-      { name: "1Panel 官网", url: `${SITE_URL}/` },
-      { name: "1Panel 自托管解决方案", url: `${SITE_URL}/self-hosted.html` },
+      { name: "1Panel 官网", url: toAbsoluteUrl("/", siteUrl) },
+      { name: "1Panel 自托管解决方案", url: toAbsoluteUrl("/self-hosted.html", siteUrl) },
     ]),
   ]}
 >