From cf12869614ba76c7eb5352300d9b07a9b19b1459 Mon Sep 17 00:00:00 2001 From: Agent Date: Tue, 14 Jul 2026 21:34:02 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E7=AC=AC=E4=BA=8C=E6=AC=A1=E4=BC=98?= =?UTF-8?q?=E5=8C=96=E8=BF=AD=E4=BB=A3=20-=20Links=20=E5=90=8E=E7=AB=AF?= =?UTF-8?q?=E5=88=86=E9=A1=B5+=E5=89=8D=E7=AB=AF=E5=88=86=E9=A1=B5?= =?UTF-8?q?=E5=99=A8=20-=20=E6=90=9C=E7=B4=A2=E5=85=B3=E9=94=AE=E8=AF=8D?= =?UTF-8?q?=E9=AB=98=E4=BA=AE=EF=BC=88mark=E6=A0=87=E7=AD=BE=EF=BC=89=20-?= =?UTF-8?q?=20=E6=90=9C=E7=B4=A2=E9=98=B2=E6=8A=96200ms=EF=BC=8C=E6=94=AF?= =?UTF-8?q?=E6=8C=81=E6=8F=8F=E8=BF=B0=E6=90=9C=E7=B4=A2=20-=20=E7=A7=BB?= =?UTF-8?q?=E9=99=A4=E4=B8=8D=E5=8F=AF=E7=94=A8=E7=9A=84=20type-check=20?= =?UTF-8?q?=E8=84=9A=E6=9C=AC=20-=20=E6=9B=B4=E6=96=B0=20README=20?= =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E6=96=87=E6=A1=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 99 ++++++++++++++++-------------- backend/src/routes/api.js | 21 ++++--- frontend/package.json | 3 +- frontend/src/views/Home.vue | 25 ++++++-- frontend/src/views/admin/Links.vue | 18 +++++- 5 files changed, 105 insertions(+), 61 deletions(-) diff --git a/README.md b/README.md index 7416ae7..473d6ff 100644 --- a/README.md +++ b/README.md @@ -1,62 +1,71 @@ -# yx-nav 网址导航 +# 言逍导航 (yx-nav) -## 项目简介 - -纯 Node.js 全栈实现的网址导航系统,包含前台展示页和后台管理面板。后台可配置前台的分类、网址、站点主题、布局模式等所有内容。 +精选实用网址导航系统,支持分类管理、搜索、后台管理。 ## 技术栈 -- **后端**: Node.js + Express + MySQL -- **前端**: Vue 3 + TypeScript + Vite + Element Plus +- **后端**: Node.js + Express + MySQL (110.42.189.169:9109) +- **前端**: Vue 3.5 + TypeScript + Vite 6 + Element Plus +- **部署**: Docker (端口 9110) + Jenkins CI -## 外部服务配置 - -| 服务 | 地址 | 账号 | 密码 | -|------|------|------|------| -| 数据库 (MySQL) | 110.42.189.169:9109 | yx-nav | yx-nav | -| Jenkins (CI/CD) | 110.42.189.169:9101 | hermesagent | hermesagent | -| Gitea (代码仓库) | 110.42.189.169:3000 | hermesagent/yx-nav | — | - -## 默认登录 - -后台管理:`http://localhost:5173/admin/login` -- 账号: `admin` -- 密码: `admin123` - -## 项目结构 +## 目录结构 ``` -backend/ # 后端 (Express + MySQL) - src/ - index.js # 入口,启动 Express - database.js # MySQL 连接池 + 表结构初始化 - middleware/auth.js # JWT 认证中间件 - routes/api.js # 全部 API 路由 -frontend/ # 前端 (Vue 3 + TS + Vite) - src/ - views/ - Home.vue # 前台:分类导航 + 搜索 - admin/ - Login.vue # 后台登录 - AdminLayout.vue # 后台布局 - Dashboard.vue # 仪表盘 - Links.vue # 网址管理 - Categories.vue # 分类管理 - Settings.vue # 站点配置 - api/index.ts # API 封装 - stores/user.ts # 用户状态 (Pinia) +yx-nav/ +├── backend/ # 后端服务 +│ ├── src/ +│ │ ├── index.js # 入口 + Express 配置 +│ │ ├── database.js # MySQL 连接 + 表初始化 +│ │ ├── middleware/auth.js # JWT 认证中间件 +│ │ └── routes/api.js # API 路由(公开 + 后台) +│ └── package.json +├── frontend/ # 前端应用 +│ ├── src/ +│ │ ├── views/ # 页面组件 +│ │ │ ├── Home.vue # 前台首页 +│ │ │ ├── NotFound.vue # 404 页面 +│ │ │ └── admin/ # 后台管理 +│ │ ├── api/index.ts # API 调用封装 +│ │ ├── router/index.ts # Vue Router 配置 +│ │ └── stores/user.ts # Pinia 用户状态 +│ ├── public/favicon.svg # 站点图标 +│ └── package.json +└── build.sh # Jenkins 构建脚本 ``` -## 运行 +## 本地开发 ```bash # 后端 -cd backend && npm install && npm start # 监听 3000 +cd backend +npm install +npm run dev # 前端 -cd frontend && npm install && npm run dev # 监听 5173,代理 /api → 后端 +cd frontend +npm install +npm run dev ``` -## Jenkins 发布 +前端运行在 5173 端口(自动代理 API 到 3000)。 -推送代码到 `hermesagent/yx-nav` 后,在 Jenkins `http://110.42.189.169:9101/` 手动触发 `yx-nav` job 即可构建部署。 +## 部署 + +Jenkins 构建触发(需认证): + +```bash +curl -u hermesagent:hermesagent \ + "http://110.42.189.169:9101/job/yx-nav/build?token=yx-navbuild" +``` + +## 默认管理员 + +- 用户名: `admin` +- 密码: `qq755141` + +## 服务地址 + +- 前台首页: http://110.42.189.169:9110/ +- 后台管理: http://110.42.189.169:9110/#/admin +- MySQL: 110.42.189.169:9109 (yx-nav/yx-nav) +- Jenkins: http://110.42.189.169:9101 (hermesagent/hermesagent) diff --git a/backend/src/routes/api.js b/backend/src/routes/api.js index 952da10..737b71b 100644 --- a/backend/src/routes/api.js +++ b/backend/src/routes/api.js @@ -120,14 +120,21 @@ const router = (app) => { app.get('/api/admin/links', authenticate, async (req, res) => { try { - const { keyword, categoryId } = req.query; - let sql = 'SELECT l.*, c.name as categoryName FROM links l JOIN categories c ON l.category_id = c.id'; + const { keyword, categoryId, page = '1', pageSize = '20' } = req.query; + const p = Math.max(1, Number(page)); + const ps = Math.min(100, Math.max(1, Number(pageSize))); + const offset = (p - 1) * ps; + + let where = ''; const params = []; - if (keyword) { sql += ' WHERE l.title LIKE ? OR l.description LIKE ?'; params.push(`%${keyword}%`, `%${keyword}%`); } - if (categoryId) { sql += (keyword ? ' AND' : ' WHERE') + ' l.category_id = ?'; params.push(Number(categoryId)); } - sql += ' ORDER BY l.sort, l.id'; - const [rows] = await pool.query(sql, params); - res.json({ status: 200, result: { data: rows } }); + if (keyword) { where += ' WHERE (l.title LIKE ? OR l.description LIKE ?)'; params.push(`%${keyword}%`, `%${keyword}%`); } + if (categoryId) { where += (where ? ' AND' : ' WHERE') + ' l.category_id = ?'; params.push(Number(categoryId)); } + + const [countRows] = await pool.query(`SELECT COUNT(*) as total FROM links l${where}`, params); + const total = Number(countRows[0].total); + + const [rows] = await pool.query(`SELECT l.*, c.name as categoryName FROM links l JOIN categories c ON l.category_id = c.id${where} ORDER BY l.sort, l.id LIMIT ? OFFSET ?`, [...params, ps, offset]); + res.json({ status: 200, result: { data: { list: rows, total, page: p, pageSize: ps } } }); } catch { res.json({ status: 500, message: '加载失败' }); } diff --git a/frontend/package.json b/frontend/package.json index 34754fc..76e421c 100644 --- a/frontend/package.json +++ b/frontend/package.json @@ -6,8 +6,7 @@ "scripts": { "dev": "vite", "build": "vite build", - "preview": "vite preview", - "type-check": "vue-tsc --noEmit" + "preview": "vite preview" }, "dependencies": { "vue": "^3.5.13", diff --git a/frontend/src/views/Home.vue b/frontend/src/views/Home.vue index e369f09..ba1d757 100644 --- a/frontend/src/views/Home.vue +++ b/frontend/src/views/Home.vue @@ -53,8 +53,8 @@ /> @@ -74,6 +74,7 @@ import { siteApi } from '@/api' const data = reactive({ categories: [] as any[], settings: {} as any, links: [] as any[] }) const search = ref('') const filteredLinks = ref([]) +const searchTimer = ref>() const filteredCategories = computed(() => { return data.categories.filter((cat: any) => @@ -86,10 +87,20 @@ function linksInCat(catId: number) { } function filterLinks() { - const q = search.value.trim() - filteredLinks.value = q - ? data.links.filter((l: any) => l.title.toLowerCase().includes(q)) - : [...data.links] + if (searchTimer.value) clearTimeout(searchTimer.value) + searchTimer.value = setTimeout(() => { + const q = search.value.trim().toLowerCase() + filteredLinks.value = q + ? data.links.filter((l: any) => l.title.toLowerCase().includes(q) || l.description.toLowerCase().includes(q)) + : [...data.links] + }, 200) +} + +function highlight(text: string, keyword: string) { + if (!keyword.trim()) return text + const idx = text.toLowerCase().indexOf(keyword.toLowerCase()) + if (idx === -1) return text + return text.slice(0, idx) + '' + text.slice(idx, idx + keyword.length) + '' + text.slice(idx + keyword.length) } async function loadData() { @@ -243,7 +254,9 @@ loadData() .link-info { flex: 1; min-width: 0; } .link-title { font-weight: 500; font-size: 15px; white-space: nowrap; overflow: hidden; text-overflow: ellipsis; } + .link-title :deep(mark) { background: #fef08a; color: #333; padding: 0 2px; border-radius: 2px; } .link-desc { font-size: 12px; color: #888; margin-top: 4px; white-space: nowrap; overflow: hidden; text-overflow: ellipsis; } + .link-desc :deep(mark) { background: #fef08a; color: #333; padding: 0 2px; border-radius: 2px; } } .footer { diff --git a/frontend/src/views/admin/Links.vue b/frontend/src/views/admin/Links.vue index 2200dfb..1496cd5 100644 --- a/frontend/src/views/admin/Links.vue +++ b/frontend/src/views/admin/Links.vue @@ -47,6 +47,15 @@ +
+ +
@@ -95,6 +104,9 @@ const links = ref([]) const categories = ref([]) const keyword = ref('') const catFilter = ref('') +const currentPage = ref(1) +const pageSize = ref(20) +const total = ref(0) const dialogVisible = ref(false) const editId = ref(null) const form = ref({ title: '', url: '', categoryId: '', description: '', iconUrl: '', sort: 0, isShow: true }) @@ -103,7 +115,10 @@ const dialogWidth = computed(() => window.innerWidth < 500 ? '92%' : '500px') async function loadLinks() { loading.value = true try { - links.value = (await adminApi.getLinks({ keyword: keyword.value || undefined, categoryId: catFilter.value || undefined })).result.data + const res = await adminApi.getLinks({ keyword: keyword.value || undefined, categoryId: catFilter.value || undefined, page: currentPage.value, pageSize: pageSize.value }) + const d = res.result.data + links.value = d.list + total.value = d.total } finally { loading.value = false } @@ -145,6 +160,7 @@ onMounted(async () => { await loadLinks(); await loadCats() }) .page-header h2 { font-size: 20px; font-weight: 600; } .table-wrap { overflow-x: auto; } .loading-wrap { padding: 20px; } +.pagination-wrap { display: flex; justify-content: center; margin-top: 20px; } .link-icon-preview { display: inline-flex; width: 32px;