重构: 修复致命缺陷、清理死代码并打通类型检查与构建
本次优化在不改变业务行为的前提下,修复了多处会导致数据丢失或
功能失效的缺陷,并把此前从未跑过的类型检查与生产构建接通。
== 修复的严重缺陷 ==
服务端:
- 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:
+132
-167
@@ -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;
|
||||
|
||||
Reference in New Issue
Block a user