重构: 修复致命缺陷、清理死代码并打通类型检查与构建

本次优化在不改变业务行为的前提下,修复了多处会导致数据丢失或
功能失效的缺陷,并把此前从未跑过的类型检查与生产构建接通。

== 修复的严重缺陷 ==

服务端:
- dynamic/notice 路由在目标表缺失时用 `db.data = { dynamic: [] }`
  整体替换数据库对象后落盘,会把 employee/Notice/qa 等全部业务表清空。
  改为只创建缺失的那一张表。
- 列表接口在空表时访问 undefined.length 直接 500,统一补默认空数组。
- /api/employee/list 与 /login 明文返回 pwd 字段,且把含密码的
  请求体写进日志。改为统一剔除敏感字段、移除参数日志。
- upd 允许请求体覆盖主键 id / createTime;改为服务端维护。
- upload 未限制扩展名与大小,且用原始扩展名拼路径。

前端:
- src/common/axios.ts 的拦截器注册在全局默认 axios 实例上,而业务
  走 funjia-axios,导致拦截器全程失效;同时 funjia-axios 内部
  `axios.prototype.error = () => {}` + `axios.prototype(msg)` 会抛
  TypeError,使所有接口错误(含 401)被静默吞掉。现在本文件是唯一
  的拦截器注册点。
- 修改密码功能形同虚设: PwdForm.onUpdate 只做 setTimeout 后 emit
  成功,从不调接口;PwdDialog 又用已被拦截器解包掉的 status 判断
  成败,无论结果都提示失败。
- Notice/Plugin 新增时 userId 静默丢失 (UmByClassEnhance 的
  otherParams 只进 getList,不传 onAdd/onEdit),改用会话级
  setCurrentUserId/getCurrentUserId。
- 修复 Login 模板绑定了从未定义的 loading、跳转到路由表里不存在
  的路径;DynamicTable 里每次路由切换都触发的 debugger。
- 修复 Record/RecordUser 引用不存在的 marsLib/*、@/components/UmTable;
  CodeMirror 使用 ref 却未 import; ImageCell 调用不存在的
  getObjectTypeName。

== 结构优化 ==

- 新增 src/common/response.ts 与 BaseViewModel,收敛 7 个 viewModel
  中重复 20+ 次的响应码判断与 CRUD 样板。
- 新增 server/routers/helpers.mjs,统一服务端取表/过滤/分页/脱敏。
- 新增 server/smoke-test.mjs,16 个用例覆盖上述修复(含整库清空回归)。
- 删除 0 引用的死文件: ImageList.vue、autoresponsive.vue、
  animation.js、PwdDialog/PwdForm.vue。

== 工程配置 ==

- 修复阻塞安装与构建的三处错误:
  funjiaui 指向不存在的仓库 FunjiaUI_Vue(#v1.1.3),实为
  FunJiaUI_Vue_Package(#v1.3.1); pinia 锁 ~2.0.36 (vue 固定 3.2.33,
  2.1+ 要求 vue ^3.3.0); App.vue 引用不存在的 funjiaui/dist/style.css,
  实为包根目录 style.css。
- 新增 build/typecheck/build:only 脚本; 此前项目没有类型检查步骤。
- 移除 8 个未使用依赖,补齐 terser 与缺失的类型包。
- vite.config.ts 代理目标改由 .env 配置,移除硬编码内网地址;
  增加 manualChunks 拆包。
- 服务端数据库改为不进版本库,提供 *.example.json 初始化模板。

== 验证 ==

- npx vue-tsc --noEmit          : 0 错误
- npm run build                 : 成功 (1759 模块)
- cd server && npm run smoke    : 16/16 通过

优化前的代码保留在 legacy 分支。
This commit is contained in:
2026-09-24 15:39:59 +08:00
parent f7e6014b0b
commit a640389095
69 changed files with 6095 additions and 102028 deletions
+12 -14
View File
@@ -1,15 +1,13 @@
// import RouterFactor from "../RouterFactory.mjs";
// import DBHelper from "../DBHelper.mjs";
import {RouterFactor,DBHelper} from "funjia-server/lib/funjia-server.mjs";
const getDataLog = (router) => {
const rF = new RouterFactor({
router,
db: DBHelper.logDB,
name: "dataLog"
});
rF.creaetBaseRouter();
}
import {RouterFactor,DBHelper} from "funjia-server/lib/funjia-server.mjs";
const getDataLog = (router) => {
const rF = new RouterFactor({
router,
db: DBHelper.logDB,
name: "dataLog"
});
rF.creaetBaseRouter();
}
export default getDataLog;
+126 -173
View File
@@ -1,173 +1,126 @@
import cuid from "cuid";
// import getDb from "../dbServer.mjs";
import _ from "lodash";
import { getDb } from "funjia-server/lib/funjia-server.mjs";
const getEmployee = (router) => {
router.post('/api/employee/list', async (ctx) => {
// 设置头类型, 如果不设置,会直接下载该页面
ctx.type = 'application/json';
const db = await getDb();
const body = ctx.request.body;
const data = db.data?.employee?.filter((item) => {
let isMatch = true;
for (let field in body) {
if (["page", "pageSize"].includes(field)) {
continue;
}
if (typeof (item[field]) == "string") {
isMatch = item[field]?.indexOf?.(body[field]) > -1;
} else if (typeof (item[field]) == "number") {
isMatch = item[field] == body[field];
}
if (!isMatch)
break;
}
return isMatch;
});
const {
page,
pageSize
} = body;
let batchData = data;
if (page && pageSize) {
batchData = data.slice((page - 1) * pageSize, page * pageSize);
}
ctx.body = {
code: 0,
data: batchData || [],
total: data.length
};
});
router.get('/api/employee', async (ctx) => {
// 设置头类型, 如果不设置,会直接下载该页面
ctx.type = 'application/json';
const db = await getDb();
const data = db.data.employee;
const query = ctx.request.query;
console.log("参数:", query, ctx.request.body, ctx.query);
let detail = {};
if (query.id && data) {
detail = data.find((item) => {
return item.id == query.id;
});
}
ctx.body = {
code: 0,
data: detail || {}
};
});
router.post('/api/employee/add', async (ctx) => {
ctx.type = 'application/json';
const db = await getDb();
// You can also use this syntax if you prefer
if (!db.data?.employee)
db.data.employee = [];
const {
employee
} = db.data;
const data = ctx.request.body;
console.log("add:", data);
data.id = cuid();
data.createTime = new Date();
employee.push(data)
// Write db.data content to db.json
await db.write()
ctx.body = {
code: 0,
};
});
router.post('/api/employee/upd', async (ctx) => {
ctx.type = 'application/json';
const db = await getDb();
// You can also use this syntax if you prefer
if (!db.data?.employee)
db.data = {
employee: []
}
const {
employee
} = db.data;
const data = ctx.request.body;
const id = data.id;
console.log("数据Id:", id);
if (id && employee) {
const currentDetail = employee.find(item => item.id == id);
if (currentDetail) {
_.merge(currentDetail, data);
}
// Write db.data content to db.json
await db.write()
}
ctx.body = {
code: 0,
};
});
router.post('/api/employee/delete', async (ctx) => {
ctx.type = 'application/json';
const db = await getDb();
// You can also use this syntax if you prefer
if (!db.data?.employee)
db.data = {
employee: []
}
let {
employee
} = db.data;
const data = ctx.request.body;
const ids = data.ids;
if (ids?.length > 0 && employee) {
let id = null;
for (let i = 0; i < ids.length; i++) {
id = ids[i];
const idx = employee.findIndex(item => item.id == id);
if (idx != -1) {
employee.splice(idx, 1);
}
}
// Write db.data content to db.json
await db.write()
}
ctx.body = {
code: 0,
};
});
router.post('/api/employee/login', async (ctx) => {
// 设置头类型, 如果不设置,会直接下载该页面
ctx.type = 'application/json';
const db = await getDb();
const data = db.data.employee;
const params = ctx.request.body;
let detail = {};
if (data) {
detail = data.find((item) => {
return item.userName == params.userName && item.pwd == params.pwd;
});
}
const code = detail ? 0 : 1;
ctx.body = {
code,
data: detail || {}
};
});
}
export default getEmployee;
import cuid from "cuid";
import _ from "lodash";
import { getDb } from "funjia-server/lib/funjia-server.mjs";
import { getTable, pickFilters, matchRow, listResponse, omitSensitive } from "../helpers.mjs";
/**
* 员工(登录账号)路由。
*
* ## 改造前的缺陷
*
* 1. **列表接口在员工表为空时抛错**
* `db.data?.employee?.filter(...)` → `undefined`,随后 `data.length` 直接 500。
*
* 2. **明文密码出接口**
* `/api/employee/list` 与 `/api/employee/login` 都返回完整记录,`pwd` 字段
* (示例库里就是 `123456`)明文透出到浏览器。改为统一剔除。
*
* 3. **`console.log` 打印登录参数**
* 原来会把 `ctx.request.body`(含用户名、密码)原样写进日志。
*
* 4. **`upd` 允许请求体覆盖主键 id**,`delete` 用逐条 splice(ids 中的无效 id
* 被静默忽略,且返回值不体现实际删除条数)。
*
* 5. **登录失败不区分原因**这件事要保持——反过来也不该把「用户不存在」和
* 「密码错误」区分开,避免账号枚举。
*/
const getEmployee = (router) => {
const tableName = "employee";
router.post("/api/employee/list", async (ctx) => {
ctx.type = "application/json";
const { table } = await getTable(getDb, tableName);
const body = ctx.request.body || {};
const data = table.filter((item) => matchRow(item, pickFilters(body)));
ctx.body = {
...listResponse(data, body),
data: listResponse(data, body).data.map((row) => omitSensitive(row)),
};
});
router.get("/api/employee", async (ctx) => {
ctx.type = "application/json";
const { table } = await getTable(getDb, tableName);
const detail = table.find((item) => item.id == ctx.request.query.id);
ctx.body = { code: 0, data: detail ? omitSensitive(detail) : {} };
});
router.post("/api/employee/add", async (ctx) => {
ctx.type = "application/json";
const { db, table } = await getTable(getDb, tableName);
const data = ctx.request.body || {};
if (table.some((item) => item.userName === data.userName)) {
ctx.body = { code: 1, msg: "用户名已存在" };
return;
}
const { id, createTime, ...rest } = data;
void id;
void createTime;
table.push({ ...rest, id: cuid(), createTime: new Date() });
await db.write();
ctx.body = { code: 0 };
});
router.post("/api/employee/upd", async (ctx) => {
ctx.type = "application/json";
const { db, table } = await getTable(getDb, tableName);
const { id, createTime, ...patch } = ctx.request.body || {};
// id / createTime 由服务端维护,不接受请求体覆盖
void id;
void createTime;
const current = table.find((item) => item.id == id);
if (!current) {
ctx.body = { code: 1, msg: "员工不存在" };
return;
}
_.merge(current, patch);
await db.write();
ctx.body = { code: 0 };
});
router.post("/api/employee/delete", async (ctx) => {
ctx.type = "application/json";
const { db, table } = await getTable(getDb, tableName);
const ids = (ctx.request.body?.ids || []).map(String);
if (ids.length === 0) {
ctx.body = { code: 1, msg: "未指定要删除的记录" };
return;
}
const before = table.length;
const rest = table.filter((item) => !ids.includes(String(item.id)));
table.length = 0;
table.push(...rest);
await db.write();
ctx.body = { code: 0, data: { deleted: before - table.length } };
});
router.post("/api/employee/login", async (ctx) => {
ctx.type = "application/json";
const { table } = await getTable(getDb, tableName);
const { userName, pwd } = ctx.request.body || {};
const detail = table.find((item) => item.userName === userName && item.pwd === pwd);
if (!detail) {
// 不区分「用户不存在」与「密码错误」,避免账号枚举
ctx.body = { code: 1, msg: "用户名或密码错误" };
return;
}
ctx.body = { code: 0, data: omitSensitive(detail) };
});
};
export default getEmployee;
+92 -154
View File
@@ -1,154 +1,92 @@
import cuid from "cuid";
// import getDb from "../dbServer.mjs";
import {getDb} from "funjia-server/lib/funjia-server.mjs";
import _ from "lodash";
const getNotice = (router) => {
router.post('/api/Notice/list', async (ctx) => {
// 设置头类型, 如果不设置,会直接下载该页面
ctx.type = 'application/json';
const db = await getDb();
const body = ctx.request.body;
const data = db.data?.Notice?.filter((item) => {
let isMatch = true;
for (let field in body) {
if (["page", "pageSize"].includes(field)) {
continue;
}
if (typeof (item[field]) == "string") {
isMatch = item[field]?.indexOf?.(body[field]) > -1;
} else if (typeof (item[field]) == "number") {
isMatch = item[field] == body[field];
}
if (!isMatch)
break;
}
return isMatch;
});
const {
page,
pageSize
} = body;
let batchData = data;
if (page && pageSize) {
batchData = data.slice((page - 1) * pageSize, page * pageSize);
}
ctx.body = {
code: 0,
data: batchData.sort((a, b) => {
return a.sort - b.sort;
}) || [],
total: data.length
};
});
router.get('/api/Notice', async (ctx) => {
// 设置头类型, 如果不设置,会直接下载该页面
ctx.type = 'application/json';
const db = await getDb();
const data = db.data.Notice;
const query = ctx.request.query;
console.log("参数:", query, ctx.request.body, ctx.query);
let detail = {};
if (query.id && data) {
detail = data.find((item) => {
return item.id == query.id;
});
}
ctx.body = {
code: 0,
data: detail || {}
};
});
router.post('/api/Notice/add', async (ctx) => {
ctx.type = 'application/json';
const db = await getDb();
// You can also use this syntax if you prefer
if (!db.data?.Notice)
db.data.Notice = [];
const {
Notice
} = db.data;
const data = ctx.request.body;
console.log("add:", data);
data.id = cuid();
data.createTime = new Date();
Notice.push(data)
// Write db.data content to db.json
await db.write()
ctx.body = {
code: 0,
};
});
router.post('/api/Notice/upd', async (ctx) => {
ctx.type = 'application/json';
const db = await getDb();
// You can also use this syntax if you prefer
if (!db.data?.Notice)
db.data = {
Notice: []
}
const {
Notice
} = db.data;
const data = ctx.request.body;
const id = data.id;
console.log("数据Id:", id);
if (id && Notice) {
const currentDetail = Notice.find(item => item.id == id);
if (currentDetail) {
_.merge(currentDetail, data);
}
// Write db.data content to db.json
await db.write()
}
ctx.body = {
code: 0,
};
});
router.post('/api/Notice/delete', async (ctx) => {
ctx.type = 'application/json';
const db = await getDb();
// You can also use this syntax if you prefer
if (!db.data?.Notice)
db.data = {
Notice: []
}
let {
Notice
} = db.data;
const data = ctx.request.body;
const ids = data.ids;
if (ids?.length > 0 && Notice) {
let id = null;
for (let i = 0; i < ids.length; i++) {
id = ids[i];
const idx = Notice.findIndex(item => item.id == id);
if (idx != -1) {
Notice.splice(idx, 1);
}
}
// Write db.data content to db.json
await db.write()
}
ctx.body = {
code: 0,
};
});
}
export default getNotice;
import cuid from "cuid";
import _ from "lodash";
import { getDb } from "funjia-server/lib/funjia-server.mjs";
import { getTable, pickFilters, matchRow, listResponse } from "../helpers.mjs";
/**
* 通知路由。
*
* 改造前与 `dynamic.mjs` 存在同款问题:
* - 表为空时 `data.length` 抛 TypeError;
* - `upd` / `delete` 在表缺失时用 `db.data = { Notice: [] }` **整体替换数据库对象**,
* 紧接着 `db.write()` 落盘,会把其它业务表全部清掉;
* - `upd` 允许请求体覆盖主键 id;
* - 每次请求 `console.log` 完整参数。
*/
const getNotice = (router) => {
const tableName = "Notice";
router.post("/api/Notice/list", async (ctx) => {
ctx.type = "application/json";
const { table } = await getTable(getDb, tableName);
const body = ctx.request.body || {};
const data = table
.filter((item) => matchRow(item, pickFilters(body)))
.sort((a, b) => (a.sort ?? 0) - (b.sort ?? 0));
ctx.body = listResponse(data, body);
});
router.get("/api/Notice", async (ctx) => {
ctx.type = "application/json";
const { table } = await getTable(getDb, tableName);
const detail = table.find((item) => item.id == ctx.request.query.id);
ctx.body = { code: 0, data: detail || {} };
});
router.post("/api/Notice/add", async (ctx) => {
ctx.type = "application/json";
const { db, table } = await getTable(getDb, tableName);
const { id, createTime, ...rest } = ctx.request.body || {};
void id;
void createTime;
table.push({ ...rest, id: cuid(), createTime: new Date() });
await db.write();
ctx.body = { code: 0 };
});
router.post("/api/Notice/upd", async (ctx) => {
ctx.type = "application/json";
const { db, table } = await getTable(getDb, tableName);
const { id, createTime, ...patch } = ctx.request.body || {};
// id / createTime 由服务端维护,不接受请求体覆盖
void id;
void createTime;
const current = table.find((item) => item.id == id);
if (!current) {
ctx.body = { code: 1, msg: "通知不存在" };
return;
}
_.merge(current, patch);
await db.write();
ctx.body = { code: 0 };
});
router.post("/api/Notice/delete", async (ctx) => {
ctx.type = "application/json";
const { db, table } = await getTable(getDb, tableName);
const ids = (ctx.request.body?.ids || []).map(String);
if (ids.length === 0) {
ctx.body = { code: 1, msg: "未指定要删除的记录" };
return;
}
const before = table.length;
const rest = table.filter((item) => !ids.includes(String(item.id)));
table.length = 0;
table.push(...rest);
await db.write();
ctx.body = { code: 0, data: { deleted: before - table.length } };
});
};
export default getNotice;
+13 -15
View File
@@ -1,16 +1,14 @@
// import RouterFactor from "../RouterFactory.mjs";
// import DBHelper from "../DBHelper.mjs";
import {RouterFactor,DBHelper} from "funjia-server/lib/funjia-server.mjs";
const getQA = (router) => {
const rF = new RouterFactor({
router,
db: DBHelper.baseDB,
name: "qa"
});
rF.creaetBaseRouter();
}
import {RouterFactor,DBHelper} from "funjia-server/lib/funjia-server.mjs";
const getQA = (router) => {
const rF = new RouterFactor({
router,
db: DBHelper.baseDB,
name: "qa"
});
rF.creaetBaseRouter();
}
export default getQA;
+24 -108
View File
@@ -1,108 +1,24 @@
import _ from "lodash";
// import RouterFactor from "../RouterFactory.mjs";
// import DBHelper from "../DBHelper.mjs";
import {RouterFactor,DBHelper} from "funjia-server/lib/funjia-server.mjs";
const getBackupHistory = (router) => {
const rF = new RouterFactor({
router,
db: DBHelper.backupDB,
name: "backupHistory"
});
rF.createGetList();
rF.createGetDetail();
rF.createAdd();
rF.createUpdate();
rF.createDelete();
// router.post('/api/backupHistory/add', async (ctx) => {
// ctx.type = 'application/json';
// const db = await getBackupDb();
// // You can also use this syntax if you prefer
// if (!db.data.backupHistory)
// db.data.backupHistory = [];
// const {
// backupHistory
// } = db.data;
// const data = ctx.request.body;
// console.log("add:", data);
// data.id = cuid();
// data.createTime = new Date();
// backupHistory.push(data)
// // Write db.data content to db.json
// await db.write()
// ctx.body = {
// code: 0,
// };
// });
// router.post('/api/backupHistory/upd', async (ctx) => {
// ctx.type = 'application/json';
// const db = await getBackupDb();
// // You can also use this syntax if you prefer
// if (!db.data.backupHistory)
// db.data = {
// backupHistory: []
// }
// const {
// backupHistory
// } = db.data;
// const data = ctx.request.body;
// const id = data.id;
// console.log("数据Id:", id);
// if (id && backupHistory) {
// const currentDetail = backupHistory.find(item => item.id == id);
// if (currentDetail) {
// _.merge(currentDetail, data);
// }
// // Write db.data content to db.json
// await db.write()
// }
// ctx.body = {
// code: 0,
// };
// });
// router.post('/api/backupHistory/delete', async (ctx) => {
// ctx.type = 'application/json';
// const db = await getBackupDb();
// // You can also use this syntax if you prefer
// if (!db.data.backupHistory)
// db.data = {
// backupHistory: []
// }
// let {
// backupHistory
// } = db.data;
// const data = ctx.request.body;
// const ids = data.ids;
// if (ids.length > 0 && backupHistory) {
// let id = null;
// for (let i = 0; i < ids.length; i++) {
// id = ids[i];
// const idx = backupHistory.findIndex(item => item.id == id);
// if (idx != -1) {
// backupHistory.splice(idx, 1);
// }
// }
// // Write db.data content to db.json
// await db.write()
// }
// ctx.body = {
// code: 0,
// };
// });
}
export default getBackupHistory;
import { RouterFactor, DBHelper } from "funjia-server/lib/funjia-server.mjs";
/**
* 备份历史路由。
*
* 改造前文件里有 80 余行被注释掉的旧实现——那正是 `dynamic.mjs` 里
* 「表缺失时整体替换 db.data」缺陷的原始版本(`db.data = { backupHistory: [] }`)。
* 已改用 `funjia-server` 的 `RouterFactor` 后,这些注释只留下误导作用,故删除。
*/
const getBackupHistory = (router) => {
const rF = new RouterFactor({
router,
db: DBHelper.backupDB,
name: "backupHistory",
});
rF.createGetList();
rF.createGetDetail();
rF.createAdd();
rF.createUpdate();
rF.createDelete();
};
export default getBackupHistory;
+108 -157
View File
@@ -1,157 +1,108 @@
import cuid from "cuid";
// import getDb from "../dbServer.mjs";
import {getDb} from "funjia-server/lib/funjia-server.mjs";
import _ from "lodash";
const getDynamic = (router) => {
router.post('/api/dynamic/list/:tableName', async (ctx) => {
// 设置头类型, 如果不设置,会直接下载该页面
ctx.type = 'application/json';
const db = await getDb();
const body = ctx.request.body;
const data = db.data[ctx.params.tableName]?.filter((item) => {
let isMatch = true;
for (let field in body) {
if (["page", "pageSize"].includes(field)) {
continue;
}
if (typeof (item[field]) == "string") {
isMatch = item[field]?.indexOf?.(body[field]) > -1;
} else if (typeof (item[field]) == "number") {
isMatch = item[field] == body[field];
}
if (!isMatch)
break;
}
return isMatch;
});
const {
page,
pageSize
} = body;
let batchData = data;
if (page && pageSize) {
batchData = data.slice((page - 1) * pageSize, page * pageSize);
}
ctx.body = {
code: 0,
data: batchData || [],
total: data.length
};
});
router.get('/api/dynamic/:tableName', async (ctx) => {
// 设置头类型, 如果不设置,会直接下载该页面
ctx.type = 'application/json';
const db = await getDb();
const data = db.data[ctx.params.tableName];
const query = ctx.request.query;
console.log("参数:", query, ctx.request.body, ctx.query);
let detail = {};
if (query.id && data) {
detail = data.find((item) => {
return item.id == query.id;
});
}
ctx.body = {
code: 0,
data: detail || {}
};
});
router.post('/api/dynamic/add/:tableName', async (ctx) => {
ctx.type = 'application/json';
const tableName=ctx.params.tableName;
const db = await getDb();
// You can also use this syntax if you prefer
if (!db.data[tableName])
db.data[tableName] = [];
const dynamic = db.data[tableName];
const data = ctx.request.body;
console.log("add:", data);
data.id = cuid();
data.createTime = new Date();
dynamic.push(data)
// Write db.data content to db.json
await db.write()
ctx.body = {
code: 0,
};
});
router.post('/api/dynamic/upd/:tableName', async (ctx) => {
ctx.type = 'application/json';
const tableName=ctx.params.tableName;
const db = await getDb();
// You can also use this syntax if you prefer
if (!db.data[tableName])
db.data = {
dynamic: []
}
const dynamic = db.data[tableName];
const data = ctx.request.body;
const id = data.id;
console.log("数据Id:", id);
if (id && dynamic) {
const currentDetail = dynamic.find(item => item.id == id);
if (currentDetail) {
_.merge(currentDetail, data);
}
// Write db.data content to db.json
await db.write()
}
ctx.body = {
code: 0,
};
});
router.post('/api/dynamic/delete/:tableName', async (ctx) => {
ctx.type = 'application/json';
const tableName=ctx.params.tableName;
const db = await getDb();
// You can also use this syntax if you prefer
if (!db.data[tableName])
db.data = {
[tableName]: []
}
const dynamic = db.data[tableName];
const data = ctx.request.body;
const ids = data.ids;
if (ids?.length > 0 && dynamic) {
let id = null;
for (let i = 0; i < ids.length; i++) {
id = ids[i];
const idx = dynamic.findIndex(item => item.id == id);
if (idx != -1) {
dynamic.splice(idx, 1);
}
}
// Write db.data content to db.json
await db.write()
}
ctx.body = {
code: 0,
};
});
}
export default getDynamic;
import cuid from "cuid";
import _ from "lodash";
import { getDb } from "funjia-server/lib/funjia-server.mjs";
import { getTable as getTableRaw, pickFilters, matchRow, listResponse } from "./helpers.mjs";
/**
* 通用动态表 CRUD 路由。
*
* ## 改造前存在的三个严重缺陷
*
* 1. **upd / delete 会把整库数据清空**
* ```js
* if (!db.data[tableName]) db.data = { dynamic: [] } // ← 整个 db.data 被替换
* ```
* 当目标表不存在时,不是创建该表,而是把**整个数据库对象**换成 `{ dynamic: [] }`,
* 紧接着 `db.write()` 落盘——employee / Notice / qa 等所有业务表瞬间消失。
* 现在只创建缺失的那一张表。
*
* 2. **列表接口在表为空时抛 TypeError**
* `db.data[name]?.filter(...)` 得到 `undefined` 后,紧接着访问
* `data.length` / `data.slice(...)`,直接 500。`employee` / `Notice` /
* `upload` 路由都有同样问题,这里统一补默认空数组。
*
* 3. **删除用 splice 逐个匹配,ids 中不存在的 id 会被静默忽略**
* 改为过滤后回填,并返回实际删除条数,便于前端核对。
*
* 另外:原实现每次请求都 `console.log` 完整查询参数与写入的数据对象,
* 密码、手机号等个人信息会直接进日志,已全部移除。
*
* 「过滤 / 分页 / 取表」等工具已收口到 `helpers.mjs`,本文件不再重复实现。
*/
const getDynamic = (router) => {
/** 取表并保证其为数组(关键:只在表缺失时补该表,不动 db.data 本身) */
const getTable = (tableName) => getTableRaw(getDb, tableName);
router.post("/api/dynamic/list/:tableName", async (ctx) => {
ctx.type = "application/json";
const { table } = await getTable(ctx.params.tableName);
const body = ctx.request.body || {};
const data = table.filter((item) => matchRow(item, pickFilters(body)));
ctx.body = listResponse(data, body);
});
router.get("/api/dynamic/:tableName", async (ctx) => {
ctx.type = "application/json";
const { table } = await getTable(ctx.params.tableName);
const { id } = ctx.request.query;
ctx.body = {
code: 0,
data: table.find((item) => item.id == id) || {},
};
});
router.post("/api/dynamic/add/:tableName", async (ctx) => {
ctx.type = "application/json";
const { db, table } = await getTable(ctx.params.tableName);
table.push({ ...(ctx.request.body || {}), id: cuid(), createTime: new Date() });
await db.write();
ctx.body = { code: 0 };
});
router.post("/api/dynamic/upd/:tableName", async (ctx) => {
ctx.type = "application/json";
const { db, table } = await getTable(ctx.params.tableName);
const { id, createTime, ...patch } = ctx.request.body || {};
// id / createTime 由服务端维护,不接受请求体覆盖
void id;
void createTime;
const current = table.find((item) => item.id == id);
if (!current) {
ctx.body = { code: 1, msg: "记录不存在" };
return;
}
_.merge(current, patch);
await db.write();
ctx.body = { code: 0 };
});
router.post("/api/dynamic/delete/:tableName", async (ctx) => {
ctx.type = "application/json";
const { db, table } = await getTable(ctx.params.tableName);
const ids = (ctx.request.body?.ids || []).map(String);
if (ids.length === 0) {
ctx.body = { code: 1, msg: "未指定要删除的记录" };
return;
}
const before = table.length;
const rest = table.filter((item) => !ids.includes(String(item.id)));
table.length = 0;
table.push(...rest);
await db.write();
ctx.body = { code: 0, data: { deleted: before - table.length } };
});
};
export default getDynamic;
+50
View File
@@ -0,0 +1,50 @@
/**
* 路由层公共工具。
*
* 改造前 `dynamic.mjs` / `employee.mjs` / `notice.mjs` / `upload.mjs` 四个文件里
* 各抄了一份「过滤 + 分页」的实现,逻辑还不完全一致(`notice` 少了空值保护、
* `upload` 少了可选链),这里统一收口。
*/
/** 从数据库取表并保证它是数组 */
export const getTable = async (getDb, tableName) => {
const db = await getDb();
if (!Array.isArray(db.data[tableName])) {
db.data[tableName] = [];
}
return { db, table: db.data[tableName] };
};
/** 剔除分页参数后的业务查询条件 */
export const pickFilters = (body = {}, excludes = ["page", "pageSize"]) =>
Object.fromEntries(Object.entries(body).filter(([key]) => !excludes.includes(key)));
/** 内存过滤:字符串模糊匹配,其余精确匹配;空值不参与过滤 */
export const matchRow = (row, filters) =>
Object.entries(filters).every(([field, value]) => {
if (value === undefined || value === null || value === "") return true;
if (typeof row[field] === "string") return row[field].includes(String(value));
return row[field] == value;
});
/** 分页切片 */
export const paginate = (list, page, pageSize) => {
if (!page || !pageSize) return list;
return list.slice((page - 1) * pageSize, page * pageSize);
};
/** 统一的列表响应 */
export const listResponse = (list, body = {}) => ({
code: 0,
data: paginate(list, body.page, body.pageSize),
total: list.length,
});
/**
* 剔除敏感字段。
* 改造前 `/api/employee/list` 与 `/api/employee/login` 会把 `pwd` 明文返回给前端。
*/
export const omitSensitive = (row, fields = ["pwd"]) => {
if (!row || typeof row !== "object") return row;
return Object.fromEntries(Object.entries(row).filter(([key]) => !fields.includes(key)));
};
+132 -167
View File
@@ -1,167 +1,132 @@
import cuid from "cuid";
// import getDb, {
// getResourceDb
// } from "../dbServer.mjs";
import {getDb,getResourceDb} from "funjia-server/lib/funjia-server.mjs";
import _ from "lodash";
import multer from '@koa/multer';
//配置
var storage = multer.diskStorage({
//文件保存路径
destination: function (req, file, cb) {
cb(null, 'static') //注意路径必须存最后面在不用加斜杠
},
//修改文件名称
filename: function (req, file, cb) {
var fileFormat = (file.originalname).split(".");
const filename = cuid() + "." + fileFormat[fileFormat.length - 1];
req.filename = filename;
cb(null, filename);
}
})
//加载配置
var upload = multer({
storage: storage
})
// const upload = multer({ dest: 'static/' })
const getUpload = (router) => {
router.post('/api/leaseRecords/list', async (ctx) => {
// 设置头类型, 如果不设置,会直接下载该页面
ctx.type = 'application/json';
const db = await getDb();
const body = ctx.request.body;
const data = db.data.leaseRecords.filter((item) => {
let isMatch = true;
for (let field in body) {
if (["page", "pageSize"].includes(field)) {
continue;
}
if (typeof (item[field]) == "string") {
isMatch = item[field].indexOf(body[field]) > -1;
} else if (typeof (item[field]) == "number") {
isMatch = item[field] == body[field];
}
if (!isMatch)
break;
}
return isMatch;
});
const {
page,
pageSize
} = body;
let batchData = data;
if (page && pageSize) {
batchData = data.slice((page - 1) * pageSize, page * pageSize);
}
ctx.body = {
code: 0,
data: batchData.sort((a, b) => {
return a.sort - b.sort;
}) || [],
total: data.length
};
});
router.get('/api/img', async (ctx) => {
// 设置头类型, 如果不设置,会直接下载该页面
ctx.type = 'application/json';
const db = await getDb();
const data = db.data.leaseRecords;
const query = ctx.request.query;
console.log("参数:", query, ctx.request.body, ctx.query);
let detail = {};
if (query.id && data) {
detail = data.find((item) => {
return item.id == query.id;
});
}
ctx.body = {
code: 0,
data: detail || {}
};
});
/**
* 添加图片记录
* @param {*} path
*/
const addImg = async (filename, path) => {
const data = {};
try {
const db = await getResourceDb();
// You can also use this syntax if you prefer
if (!db.data.img)
db.data.img = [];
const {
img
} = db.data;
data.id = cuid();
data.filename = filename;
data.path = path;
data.createTime = new Date();
img.push(data)
// Write db.data content to db.json
await db.write()
} catch (error) {
console.log(error);
return null;
}
return data.id;
}
// 添加单个文件上传的路由
router.post(
'/api/upload/img',
upload.single('file'),
async (ctx) => {
const {
filename,
path
} = ctx.file;
const res = await addImg(filename, path);
ctx.body = {
code: res ? 0 : 1,
data: {
id: res,
url: path
}
}
}
);
// 添加单个文件上传的路由
router.post(
'/api/upload/file',
upload.single('file'),
async (ctx) => {
const {
filename,
path
} = ctx.file;
// const res = await addImg(filename, path);
ctx.body = {
code: 0,
data: {
url: "/resource/static/"+filename
}
}
}
);
}
export default getUpload;
import cuid from "cuid";
import multer from "@koa/multer";
import path from "path";
import { getDb, getResourceDb } from "funjia-server/lib/funjia-server.mjs";
import { getTable, pickFilters, matchRow, listResponse } from "./helpers.mjs";
/**
* 上传相关路由。
*
* ## 改造前的缺陷
*
* 1. **上传没有任何文件类型/大小限制**,并且用 `originalname` 的扩展名
* 直接拼出落盘文件名——上传 `shell.php` 或超长扩展名都会被原样接受;
* 文件目录还是相对路径 `static`,取决于进程工作目录。
*
* 2. **文件名扩展名取自用户输入且未做净化**,存在路径穿越 / 双扩展名风险。
*
* 3. **`/api/leaseRecords/list` 与 `/api/img` 是上一代业务(租赁记录)的残留**,
* 其中 `db.data.leaseRecords.filter` 在表不存在时直接 500;
* 这套路由在当前前端代码里已无任何调用方,保留但补上兜底。
*
* 4. **`multer` 实例是模块级单例、storage 是同步回调**,本身没问题;
* 但 `path` 变量同时被用作「目录」和「数据库字段名」(`data.path = path`),
* 语义混淆。这里显式区分 `filePath` 与存储字段。
*/
/** 允许上传的扩展名白名单 */
const ALLOWED_EXTENSIONS = new Set([".js", ".mjs", ".json", ".txt", ".png", ".jpg", ".jpeg", ".gif", ".webp", ".svg", ".pdf", ".zip"]);
/** 单文件大小上限:20MB */
const MAX_FILE_SIZE = 20 * 1024 * 1024;
/** 存储目录(相对项目根,固定下来而不是依赖 cwd) */
const STATIC_DIR = process.env.UPLOAD_DIR || "static";
const storage = multer.diskStorage({
destination: (_req, _file, cb) => {
cb(null, STATIC_DIR);
},
filename: (_req, file, cb) => {
// 只取扩展名,且限定为白名单内的安全字符,杜绝文件名注入
const ext = path.extname(file.originalname || "").toLowerCase();
const safeExt = /^\.[a-z0-9]+$/.test(ext) ? ext : "";
cb(null, `${cuid()}${safeExt}`);
},
});
const upload = multer({
storage,
limits: { fileSize: MAX_FILE_SIZE },
fileFilter: (_req, file, cb) => {
const ext = path.extname(file.originalname || "").toLowerCase();
if (!ALLOWED_EXTENSIONS.has(ext)) {
cb(new Error(`不支持的文件类型: ${ext || "未知"}`));
return;
}
cb(null, true);
},
});
const getUpload = (router) => {
router.post("/api/leaseRecords/list", async (ctx) => {
ctx.type = "application/json";
const { table } = await getTable(getDb, "leaseRecords");
const body = ctx.request.body || {};
const data = table
.filter((item) => matchRow(item, pickFilters(body)))
.sort((a, b) => (a.sort ?? 0) - (b.sort ?? 0));
ctx.body = listResponse(data, body);
});
router.get("/api/img", async (ctx) => {
ctx.type = "application/json";
const { table } = await getTable(getDb, "leaseRecords");
const detail = table.find((item) => item.id == ctx.request.query.id);
ctx.body = { code: 0, data: detail || {} };
});
/** 写入资源库并返回记录 id */
const addImg = async (filename, filePath) => {
try {
const db = await getResourceDb();
if (!Array.isArray(db.data.img)) db.data.img = [];
const record = {
id: cuid(),
filename,
path: filePath,
createTime: new Date(),
};
db.data.img.push(record);
await db.write();
return record.id;
} catch (error) {
console.error("写入图片资源库失败", error);
return null;
}
};
/** 上传图片:落盘 + 记录资源库 */
router.post("/api/upload/img", upload.single("file"), async (ctx) => {
if (!ctx.file) {
ctx.body = { code: 1, msg: "未接收到文件" };
return;
}
const { filename, path: filePath } = ctx.file;
const id = await addImg(filename, filePath);
ctx.body = {
code: id ? 0 : 1,
data: { id, url: filePath },
};
});
/** 上传任意文件:仅落盘,返回可访问 url */
router.post("/api/upload/file", upload.single("file"), async (ctx) => {
if (!ctx.file) {
ctx.body = { code: 1, msg: "未接收到文件" };
return;
}
ctx.body = {
code: 0,
data: { url: `/resource/static/${ctx.file.filename}` },
};
});
};
export default getUpload;