Mereithhh · Mister-Hope · May 16, 2023
diff --git a/packages/admin/src/components/SiteInfoForm/index.tsx b/packages/admin/src/components/SiteInfoForm/index.tsx
@@ -146,7 +146,7 @@ export default function (props: {
       )}
       {props.showOption && (
         <>
-          <ProFormText name="copyrightAggreement" label="版权协议" placeholder={'版权协议'} />
+          <ProFormText name="copyrightAgreement" label="版权协议" placeholder={'版权协议'} />
           <ProFormText
             name="beianNumber"
             label="IPC 备案号"

diff --git a/packages/server/src/types/site.dto.ts b/packages/server/src/types/site.dto.ts
@@ -21,7 +21,11 @@ export class SiteInfo {
   baseUrl: string;
   gaAnalysisId: string;
   baiduAnalysisId: string;
+  /**
+   * @deprecated Use `copyrightAgreement` instead
+   */
   copyrightAggreement: string;
+  copyrightAgreement: string;
   enableComment?: 'true' | 'false';
   showSubMenu?: 'true' | 'false';
   headerLeftContent?: 'siteLogo' | 'siteName';

diff --git a/packages/website/api/getAllData.ts b/packages/website/api/getAllData.ts
@@ -109,7 +109,11 @@ export interface MetaProps {
     baiduAnalysisId?: string;
     gaAnalysisId?: string;
     siteLogoDark?: string;
+    /**
+     * @deprecated You should use `copyrightAgreement` instead
+     */
     copyrightAggreement: string;
+    copyrightAgreement: string;
     showSubMenu?: "true" | "false";
     showAdminButton?: "true" | "false";
     headerLeftContent?: "siteLogo" | "siteName";
@@ -162,7 +166,7 @@ const defaultMeta: MetaProps = {
     favicon: "/logo.svg",
     siteName: "VanBlog",
     siteDesc: "Vanblog",
-    copyrightAggreement: "",
+    copyrightAgreement: "",
     beianNumber: "",
     beianUrl: "",
     gaBeianNumber: "",

diff --git a/packages/website/components/CopyRight/index.tsx b/packages/website/components/CopyRight/index.tsx
@@ -6,7 +6,7 @@ export default function (props: {
   author: string;
   id: number | string;
   showDonate: boolean;
-  copyrightAggreement: string;
+  copyrightAgreement: string;
   customCopyRight: string | null;
 }) {
   const [url, setUrl] = useState("");
@@ -16,9 +16,9 @@ export default function (props: {
 
   const text = useMemo(() => {
     if (props.customCopyRight) return props.customCopyRight;
-    return `本博客所有文章除特别声明外，均采用 ${props.copyrightAggreement}
+    return `本博客所有文章除特别声明外，均采用 ${props.copyrightAgreement}
     许可协议。转载请注明出处！`;
-  }, [props.customCopyRight, props.copyrightAggreement]);
+  }, [props.customCopyRight, props.copyrightAgreement]);
 
   return (
     <div

diff --git a/packages/website/components/PostCard/index.tsx b/packages/website/components/PostCard/index.tsx
@@ -35,7 +35,7 @@ export default function (props: {
   hideDonate?: boolean;
   hideCopyRight?: boolean;
   openArticleLinksInNewWindow: boolean;
-  copyrightAggreement: string;
+  copyrightAgreement: string;
   customCopyRight: string | null;
   showExpirationReminder: boolean;
   showEditButton: boolean;
@@ -158,7 +158,7 @@ export default function (props: {
             author={props.author as any}
             id={props.id}
             showDonate={showDonate}
-            copyrightAggreement={props.copyrightAggreement}
+            copyrightAgreement={props.copyrightAgreement}
           ></CopyRight>
         )}
 

diff --git a/packages/website/pages/about.tsx b/packages/website/pages/about.tsx
@@ -73,7 +73,7 @@ const AboutPage = (props: AboutPageProps) => {
         top={0}
         customCopyRight={null}
         showDonateInAbout={props.showDonateInAbout == "true"}
-        copyrightAggreement={props.layoutProps.copyrightAggreement}
+        copyrightAgreement={props.layoutProps.copyrightAgreement}
         showEditButton={props.layoutProps.showEditButton === "true"}
       ></PostCard>
     </Layout>

diff --git a/packages/website/pages/index.tsx b/packages/website/pages/index.tsx
@@ -52,7 +52,7 @@ const Home = (props: IndexPageProps) => {
             content={article.content || ""}
             type={"overview"}
             enableComment={props.layoutProps.enableComment}
-            copyrightAggreement={props.layoutProps.copyrightAggreement}
+            copyrightAgreement={props.layoutProps.copyrightAgreement}
           ></PostCard>
         ))}
       </div>

diff --git a/packages/website/pages/page/[p].tsx b/packages/website/pages/page/[p].tsx
@@ -37,13 +37,12 @@ const PagePages = (props: PagePagesProps) => {
       <div className="space-y-2 md:space-y-4">
         {props.articles.map((article) => (
           <PostCard
-
             showEditButton={props.layoutProps.showEditButton === "true"}
             setContent={() => {}}
             showExpirationReminder={
               props.layoutProps.showExpirationReminder == "true"
             }
-            copyrightAggreement={props.layoutProps.copyrightAggreement}
+            copyrightAgreement={props.layoutProps.copyrightAgreement}
             openArticleLinksInNewWindow={
               props.layoutProps.openArticleLinksInNewWindow == "true"
             }

diff --git a/packages/website/pages/post/[id].tsx b/packages/website/pages/post/[id].tsx
@@ -35,8 +35,8 @@ const PostPages = (props: PostPagesProps) => {
   const [content, setContent] = useState(props?.article?.content || "");
   useEffect(() => {
     // nextjs 切换页面时，不会重新设置 content ，需要手动更新
-    setContent(props?.article?.content || "")
-  }, [props.article])
+    setContent(props?.article?.content || "");
+  }, [props.article]);
   if (!props.article) {
     return <Custom404 name="文章" />;
   }
@@ -61,7 +61,7 @@ const PostPages = (props: PostPagesProps) => {
         showExpirationReminder={
           props.layoutProps.showExpirationReminder == "true"
         }
-        copyrightAggreement={props.layoutProps.copyrightAggreement}
+        copyrightAgreement={props.layoutProps.copyrightAgreement}
         openArticleLinksInNewWindow={
           props.layoutProps.openArticleLinksInNewWindow == "true"
         }

diff --git a/packages/website/utils/getLayoutProps.ts b/packages/website/utils/getLayoutProps.ts
@@ -11,7 +11,7 @@ export interface LayoutProps {
   gaBeianNumber: string;
   gaBeianUrl: string;
   gaBeianLogoUrl: string;
-  copyrightAggreement: string;
+  copyrightAgreement: string;
   logo: string;
   categories: string[];
   favicon: string;
@@ -120,7 +120,8 @@ export function getLayoutProps(data: PublicMetaProp): LayoutProps {
     subMenuOffset: siteInfo?.subMenuOffset || 0,
     showAdminButton,
     headerLeftContent,
-    copyrightAggreement: siteInfo.copyrightAggreement || "BY-NC-SA",
+    copyrightAgreement:
+      siteInfo.copyrightAgreement || siteInfo.copyrightAggreement || "BY-NC-SA",
     ipcHref: siteInfo?.beianUrl || "",
     ipcNumber: siteInfo?.beianNumber || "",
     gaBeianNumber: siteInfo?.gaBeianNumber || "",