fix: 项目整体优化
- 新增 /api/admin/stats 统计接口(Dashboard 数据准确) - 删除重复的 /api/site 路由 - 修复 /api/site/stats 响应格式一致 - Login 错误信息区分网络错误 vs 密码错误 - 清除遗留 SQLite 文件(better-sqlite3) - 移除未使用的 dotenv 依赖(环境变量由Docker传递)
This commit is contained in:
Binary file not shown.
Binary file not shown.
Generated
+128
-540
File diff suppressed because it is too large
Load Diff
+13
-15
@@ -39,27 +39,14 @@ const router = (app) => {
|
|||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
app.get('/api/site', async (req, res) => {
|
|
||||||
try {
|
|
||||||
const [cats] = await pool.query('SELECT * FROM categories ORDER BY sort, id');
|
|
||||||
const [links] = await pool.query('SELECT l.*, c.name as categoryName FROM links l JOIN categories c ON l.category_id = c.id WHERE l.is_show = 1 ORDER BY c.sort, l.sort, l.id');
|
|
||||||
const [sets] = await pool.query('SELECT * FROM settings');
|
|
||||||
const settings = {};
|
|
||||||
sets.forEach(s => { settings[s.key] = s.value; });
|
|
||||||
const linksMapped = links.map(r => ({ ...r, categoryId: r.category_id }));
|
|
||||||
res.json({ status: 200, message: '加载成功', result: { categories: cats, links: linksMapped, settings } });
|
|
||||||
} catch {
|
|
||||||
res.json({ status: 500, message: '加载失败' });
|
|
||||||
}
|
|
||||||
});
|
|
||||||
|
|
||||||
app.get('/api/site/stats', async (req, res) => {
|
app.get('/api/site/stats', async (req, res) => {
|
||||||
try {
|
try {
|
||||||
const [cats] = await pool.query('SELECT c.*, COUNT(l.id) as linkCount FROM categories c LEFT JOIN links l ON c.id = l.category_id AND l.is_show = 1 GROUP BY c.id ORDER BY c.sort, c.id');
|
const [cats] = await pool.query('SELECT c.*, COUNT(l.id) as linkCount FROM categories c LEFT JOIN links l ON c.id = l.category_id AND l.is_show = 1 GROUP BY c.id ORDER BY c.sort, c.id');
|
||||||
const [sets] = await pool.query('SELECT * FROM settings');
|
const [sets] = await pool.query('SELECT * FROM settings');
|
||||||
const settings = {};
|
const settings = {};
|
||||||
sets.forEach(s => { settings[s.key] = s.value; });
|
sets.forEach(s => { settings[s.key] = s.value; });
|
||||||
res.json({ status: 200, result: { data: { categories: cats, settings } } });
|
const totalViews = (await pool.query('SELECT COALESCE(SUM(views),0) as total FROM links'))[0][0].total;
|
||||||
|
res.json({ status: 200, result: { categories: cats, settings, totalViews } });
|
||||||
} catch {
|
} catch {
|
||||||
res.json({ status: 500, message: '加载失败' });
|
res.json({ status: 500, message: '加载失败' });
|
||||||
}
|
}
|
||||||
@@ -197,6 +184,17 @@ const router = (app) => {
|
|||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
|
// 后台统计
|
||||||
|
app.get('/api/admin/stats', authenticate, async (req, res) => {
|
||||||
|
try {
|
||||||
|
const [cats] = await pool.query('SELECT c.*, IFNULL(COUNT(l.id),0) as linkCount FROM categories c LEFT JOIN links l ON c.id = l.category_id GROUP BY c.id ORDER BY c.sort, c.id');
|
||||||
|
const [linkRows] = await pool.query('SELECT COUNT(*) as total, COALESCE(SUM(views),0) as views FROM links');
|
||||||
|
res.json({ status: 200, result: { data: { categories: cats, linkCount: Number(linkRows[0].total), totalViews: Number(linkRows[0].views) } } });
|
||||||
|
} catch {
|
||||||
|
res.json({ status: 500, message: '加载失败' });
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
app.put('/api/admin/settings', authenticate, async (req, res) => {
|
app.put('/api/admin/settings', authenticate, async (req, res) => {
|
||||||
try {
|
try {
|
||||||
for (const [key, value] of Object.entries(req.body)) {
|
for (const [key, value] of Object.entries(req.body)) {
|
||||||
|
|||||||
@@ -42,6 +42,7 @@ export const adminApi = {
|
|||||||
updateCategory: (id: number, data: any) => request.put(`/admin/categories/${id}`, data),
|
updateCategory: (id: number, data: any) => request.put(`/admin/categories/${id}`, data),
|
||||||
deleteCategory: (id: number) => request.delete(`/admin/categories/${id}`),
|
deleteCategory: (id: number) => request.delete(`/admin/categories/${id}`),
|
||||||
getLinks: (params?: any) => request.get('/admin/links', { params }),
|
getLinks: (params?: any) => request.get('/admin/links', { params }),
|
||||||
|
getStats: () => request.get('/admin/stats'),
|
||||||
addLink: (data: any) => request.post('/admin/links', data),
|
addLink: (data: any) => request.post('/admin/links', data),
|
||||||
updateLink: (id: number, data: any) => request.put(`/admin/links/${id}`, data),
|
updateLink: (id: number, data: any) => request.put(`/admin/links/${id}`, data),
|
||||||
deleteLink: (id: number) => request.delete(`/admin/links/${id}`),
|
deleteLink: (id: number) => request.delete(`/admin/links/${id}`),
|
||||||
|
|||||||
@@ -85,16 +85,13 @@ const categories = ref([])
|
|||||||
|
|
||||||
onMounted(async () => {
|
onMounted(async () => {
|
||||||
const [statsRes, setRes] = await Promise.all([
|
const [statsRes, setRes] = await Promise.all([
|
||||||
adminApi.getCategories(),
|
adminApi.getStats(),
|
||||||
adminApi.getSettings()
|
adminApi.getSettings()
|
||||||
])
|
])
|
||||||
categories.value = statsRes.result.data
|
const d = statsRes.result.data
|
||||||
|
stats.value = { linkCount: d.linkCount, catCount: d.categories.length, totalViews: d.totalViews }
|
||||||
|
categories.value = d.categories
|
||||||
settings.value = setRes.result.data
|
settings.value = setRes.result.data
|
||||||
stats.value = {
|
|
||||||
catCount: categories.value.length,
|
|
||||||
linkCount: categories.value.reduce((s: number, c: any) => s + (c.linkCount || 0), 0),
|
|
||||||
totalViews: 0,
|
|
||||||
}
|
|
||||||
})
|
})
|
||||||
</script>
|
</script>
|
||||||
|
|
||||||
|
|||||||
@@ -41,13 +41,17 @@ async function handleLogin() {
|
|||||||
loading.value = true
|
loading.value = true
|
||||||
try {
|
try {
|
||||||
const res = await authApi.login(form.value)
|
const res = await authApi.login(form.value)
|
||||||
const token = res.data.result.token
|
if (res.data.status !== 200) {
|
||||||
|
ElMessage.error(res.data.message || '用户名或密码错误')
|
||||||
|
return
|
||||||
|
}
|
||||||
|
const token = res.data.result?.token
|
||||||
store.setToken(token)
|
store.setToken(token)
|
||||||
await store.fetchProfile()
|
await store.fetchProfile()
|
||||||
ElMessage.success('登录成功')
|
ElMessage.success('登录成功')
|
||||||
router.push('/admin/dashboard')
|
router.push('/admin/dashboard')
|
||||||
} catch {
|
} catch (e: any) {
|
||||||
ElMessage.error('用户名或密码错误')
|
ElMessage.error(e.response?.data?.message || '网络错误,请检查服务器连接')
|
||||||
} finally {
|
} finally {
|
||||||
loading.value = false
|
loading.value = false
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user