From ead516d3d82e9bf04531075813c5319596864939 Mon Sep 17 00:00:00 2001 From: expdsn <18111002318@163.com> Date: Thu, 27 Feb 2025 18:40:23 +0800 Subject: [PATCH] save --- app/(main)/article/[id]/page.tsx | 13 +++++++------ app/(main)/page.tsx | 4 ++-- app/_lib/data/article.ts | 4 ++-- app/_lib/data/link.ts | 31 +++++++++---------------------- app/globals.css | 3 +++ next.config.ts | 1 + 6 files changed, 24 insertions(+), 32 deletions(-) diff --git a/app/(main)/article/[id]/page.tsx b/app/(main)/article/[id]/page.tsx index 9fe9a0e..d51046c 100644 --- a/app/(main)/article/[id]/page.tsx +++ b/app/(main)/article/[id]/page.tsx @@ -4,18 +4,19 @@ import { faArrowRight } from "@fortawesome/free-solid-svg-icons" import { FontAwesomeIcon } from "@fortawesome/react-fontawesome" import Image from "next/image" import Link from "next/link" - +const PICTURE_PREFIX = 'https://newuitab.oss-cn-hangzhou.aliyuncs.com/ai_upload/downloads/' export default async function Page({ params }: { params: Promise<{ id: string }> }) { const id = (await params).id const article = await getArticle(id) + if (!article) return <> - return
-
+ return
+
-
- - +
+ +

{article.title}

diff --git a/app/(main)/page.tsx b/app/(main)/page.tsx index f31d139..dd5d0d1 100644 --- a/app/(main)/page.tsx +++ b/app/(main)/page.tsx @@ -2,14 +2,14 @@ import SiderNav from "../_ui/SiderNav"; import Search from "../_ui/Search"; import LinkListBox from "../_ui/LinkListBox"; import { getLinkTypeList } from "../_lib/data/linkType"; -import { getLinkListAll } from "../_lib/data/link"; +import { getLinkList, getLinkListAll } from "../_lib/data/link"; import Footer from "../_ui/footer"; export default async function Page() { const { list: linkTypeList } = await getLinkTypeList({}) - const linkList = await getLinkListAll() + const { list: linkList } = await getLinkList({ page: 1, pageSize: 9999 }) return (
diff --git a/app/_lib/data/article.ts b/app/_lib/data/article.ts index 23496b8..9344241 100644 --- a/app/_lib/data/article.ts +++ b/app/_lib/data/article.ts @@ -40,8 +40,8 @@ export async function getArticleList({ page = 1, pageSize = 9999 }: { } } export async function getArticle(id: string) { - const collection = await getCollection('article'); - return collection.findOne({ _id: new ObjectId(id) }).then(res => res ? { + const collection = await getCollection('link-article'); + return collection.findOne({ _id: id as any }).then(res => res ? { ...res, _id: res._id.toString() } as ArticleType : null) diff --git a/app/_lib/data/link.ts b/app/_lib/data/link.ts index 0b2b014..f4a38c9 100644 --- a/app/_lib/data/link.ts +++ b/app/_lib/data/link.ts @@ -22,25 +22,16 @@ export async function getLinkListAll() { const list = await linkCollection.aggregate([ { '$addFields': { - 'cleanedLink': { - '$substrBytes': [ - { - '$arrayElemAt': [ - { - '$split': [ - '$link', '?' - ] - }, 0 - ] - }, 0, 1000 - ] + '_id': { + '$toString': "$_id" } } - }, { + }, + { '$lookup': { - 'from': 'article', - 'localField': 'link', - 'foreignField': 'link', + 'from': 'link-article', + 'localField': '_id', + 'foreignField': '_id', 'as': 'article' } }, { @@ -52,9 +43,6 @@ export async function getLinkListAll() { '$article._id', 0 ] } - }, - '_id': { - '$toString': "$_id" } } @@ -64,7 +52,8 @@ export async function getLinkListAll() { } } ]).toArray(); - + console.log(list); + return list; } @@ -84,7 +73,6 @@ export async function getLinkList({ page = 1, pageSize = 9999, typeId }: { // 如果 typeId 不存在，将其删除 delete query.type } - console.log(startIndex, pageSize, typeId); const pipeline = [ // 根据构建好的查询条件筛选文档 @@ -98,7 +86,6 @@ export async function getLinkList({ page = 1, pageSize = 9999, typeId }: { } } ]; - console.dir(pipeline); const cursor = collection.aggregate(pipeline); const list = await cursor.toArray(); diff --git a/app/globals.css b/app/globals.css index a11aaca..fa1c458 100644 --- a/app/globals.css +++ b/app/globals.css @@ -16,6 +16,9 @@ } @layer components { #markdown-view-preview { + h4 { + font: 1em sans-serif; + } p { font-size: var(--background); color: var(--color-gray-700); diff --git a/next.config.ts b/next.config.ts index 89ccf78..4d0ea10 100644 --- a/next.config.ts +++ b/next.config.ts @@ -25,6 +25,7 @@ const nextConfig: NextConfig = { }, ], }, + }; export default nextConfig;