befly 3.21.2 → 3.22.1

package/apis/admin/list.js

@@ -17,7 +17,7 @@ export default {
             limit: ctx.body.limit,
             where: {
                 roleCode: {
-                    $ne: "dev"
+                    $not: "dev"
                 }
             },
             orderBy: ["createdAt#DESC"]

package/apis/admin/upd.js

@@ -39,7 +39,7 @@ export default {
         if (username && username !== admin.data.username) {
             const existingUsername = await befly.mysql.getOne({
                 table: "beflyAdmin",
-                where: { username: username, id: { $ne: id } }
+                where: { username: username, id: { $not: id } }
             });
             if (existingUsername.data?.id) {
                 return befly.tool.No("用户名已被使用");
@@ -50,7 +50,7 @@ export default {
         if (nickname && nickname !== admin.data.nickname) {
             const existingNickname = await befly.mysql.getOne({
                 table: "beflyAdmin",
-                where: { nickname: nickname, id: { $ne: id } }
+                where: { nickname: nickname, id: { $not: id } }
             });
             if (existingNickname.data?.id) {
                 return befly.tool.No("昵称已被使用");

package/apis/dict/upd.js

@@ -47,7 +47,7 @@ export default {
                 where: {
                     typeCode: checkTypeCode,
                     key: checkKey,
-                    id$ne: id
+                    id$not: id
                 }
             });
 

package/apis/dictType/upd.js

@@ -25,7 +25,7 @@ export default {
                 table: "beflyDictType",
                 where: {
                     code: code,
-                    id$ne: id
+                    id$not: id
                 }
             });
 

package/apis/role/all.js

@@ -10,7 +10,7 @@ export default {
             table: "beflyRole",
             where: {
                 code: {
-                    $ne: "dev"
+                    $not: "dev"
                 }
             },
             orderBy: ["sort#ASC", "id#ASC"]

package/apis/role/list.js

@@ -16,7 +16,7 @@ export default {
             table: "beflyRole",
             where: {
                 code: {
-                    $ne: "dev"
+                    $not: "dev"
                 }
             },
             orderBy: ["sort#ASC", "id#ASC"]

package/apis/role/upd.js

@@ -22,7 +22,7 @@ export default {
             table: "beflyRole",
             where: {
                 code: ctx.body.code,
-                id$ne: ctx.body.id
+                id$not: ctx.body.id
             }
         });
 

package/apis/source/imageList.js

@@ -0,0 +1,27 @@
+export default {
+    name: "获取图库列表",
+    method: "POST",
+    body: "none",
+    auth: true,
+    fields: {
+        page: { name: "页码", input: "integer", min: 1, max: 9999 },
+        limit: { name: "每页数量", input: "integer", min: 1, max: 100 },
+        keyword: { name: "关键词", input: "string", min: 0, max: 100 }
+    },
+    required: [],
+    handler: async (befly, ctx) => {
+        const result = await befly.mysql.getList({
+            table: "beflyFile",
+            where: {
+                state: 1,
+                isImage: 1,
+                fileName$like: ctx.body.keyword
+            },
+            orderBy: ["id#DESC"],
+            page: ctx.body.page,
+            limit: ctx.body.limit
+        });
+
+        return befly.tool.Yes("操作成功", result.data);
+    }
+};

package/apis/upload/file.js

@@ -0,0 +1,105 @@
+import { mkdirSync } from "node:fs";
+import { extname, join } from "node:path";
+
+import { Logger } from "../../lib/logger.js";
+import { getAppPublicDir } from "../../paths.js";
+import { getMonthDir } from "../../utils/datetime.js";
+
+export default {
+    name: "上传文件",
+    method: "POST",
+    body: "raw",
+    auth: true,
+    fields: {},
+    required: [],
+    handler: async (befly, ctx) => {
+        try {
+            const maxFileSizeMb = Number(befly.config?.uploadMaxSize || 20);
+            const maxFileSize = maxFileSizeMb * 1024 * 1024;
+            const requestContentType = ctx.req.headers.get("content-type") || "";
+
+            if (requestContentType.toLowerCase().startsWith("multipart/form-data") === false) {
+                return befly.tool.No("请使用 FormData 上传文件");
+            }
+
+            if (!ctx.userId) {
+                return befly.tool.No("用户未登录");
+            }
+
+            const formData = await ctx.req.formData();
+            const file = formData.get("file");
+
+            if (!(file instanceof File)) {
+                return befly.tool.No("缺少上传文件");
+            }
+
+            const rawBuffer = await file.arrayBuffer();
+
+            if (!rawBuffer || rawBuffer.byteLength <= 0) {
+                return befly.tool.No("上传文件内容为空");
+            }
+
+            if (rawBuffer.byteLength > maxFileSize) {
+                return befly.tool.No(`文件不能超过${maxFileSizeMb}MB`);
+            }
+
+            const originalFileName = file.name || "未命名文件";
+            const extension = extname(originalFileName).toLowerCase();
+            const mimeType = String(file.type || "").toLowerCase();
+            const mimeTypeGroup = mimeType.split("/")[0];
+            const fileType = ["image", "video", "audio"].includes(mimeTypeGroup) ? mimeTypeGroup : "file";
+
+            const now = Date.now();
+            const categoryDir = extension ? extension.slice(1) : "files";
+            const monthDir = getMonthDir(now, befly.config?.tz);
+            const fileKey = Bun.randomUUIDv7();
+            const savedFileName = extension ? `${fileKey}${extension}` : fileKey;
+            const uploadDir = join(getAppPublicDir(befly.config?.publicDir || "./public"), categoryDir, monthDir);
+            const relativeFilePath = `/public/${categoryDir}/${monthDir}/${savedFileName}`;
+            const absoluteFileUrl = `${befly.config.staticHost}${relativeFilePath}`;
+            const isImage = fileType === "image" ? 1 : 0;
+
+            mkdirSync(uploadDir, { recursive: true });
+            await Bun.write(join(uploadDir, savedFileName), rawBuffer);
+
+            const insertRes = await befly.mysql.insData({
+                table: "beflyFile",
+                data: {
+                    userId: ctx.userId,
+                    filePath: relativeFilePath,
+                    url: absoluteFileUrl,
+                    isImage: isImage,
+                    fileType: fileType,
+                    fileSize: rawBuffer.byteLength,
+                    fileKey: fileKey,
+                    fileExt: extension,
+                    fileName: originalFileName
+                }
+            });
+
+            if (!insertRes.data) {
+                return befly.tool.No("资源记录写入失败");
+            }
+
+            return befly.tool.Yes("上传成功", {
+                id: insertRes.data,
+                userId: ctx.userId,
+                filePath: relativeFilePath,
+                fileType: fileType,
+                fileSize: rawBuffer.byteLength,
+                fileKey: fileKey,
+                fileExt: extension,
+                fileName: originalFileName,
+                isImage: isImage,
+                url: absoluteFileUrl
+            });
+        } catch (error) {
+            Logger.error("上传文件失败", error, {
+                apiPath: ctx.apiPath,
+                userId: ctx.userId,
+                roleType: ctx.roleType
+            });
+            return befly.tool.No("上传文件失败");
+        }
+    }
+};

package/checks/config.js

@@ -17,9 +17,11 @@ const configSchema = z
         appName: noTrimString,
         appPort: z.int().min(1).max(65535),
         appHost: noTrimString,
+        staticHost: noTrimString,
         devEmail: z.union([z.literal(""), z.email()]),
         devPassword: z.string().min(6),
         bodyLimit: z.int().min(1),
+        uploadMaxSize: z.int().min(1),
         tz: z.string().refine((value) => isValidTimeZone(value), "无效的时区"),
         publicDir: noTrimString.min(1),
 

package/configs/beflyConfig.json

@@ -6,9 +6,10 @@
     "devEmail": "dev@qq.com",
     "devPassword": "111111",
     "bodyLimit": 1048576,
+    "uploadMaxSize": 20,
     "tz": "Asia/Shanghai",
     "publicDir": "./public",
-
+    "staticHost": "http://127.0.0.1:3000",
     "logger": {
         "debug": 1,
         "excludeFields": ["password", "token", "secret"],

package/configs/beflyMenus.json

@@ -86,5 +86,17 @@
                 "sort": 4
             }
         ]
+    },
+    {
+        "name": "资源管理",
+        "path": "/resource",
+        "sort": 9004,
+        "children": [
+            {
+                "name": "图库管理",
+                "path": "/gallery",
+                "sort": 1
+            }
+        ]
     }
 ]

package/index.js

@@ -208,15 +208,15 @@ export class Befly {
                 fetch: async (req, server) => {
                     const url = new URL(req.url);
 
-                    if (url.pathname === "/") {
-                        return Response.json({ code: 0, msg: `${this.context.config.appName} 接口服务已启动` });
-                    }
-
                     if (url.pathname.startsWith("/api/")) {
                         return apiFetch(req, server);
                     }
 
-                    return staticFetch(req);
+                    if (url.pathname.startsWith("/public/")) {
+                        return staticFetch(req);
+                    }
+
+                    return Response.json({ code: 1, msg: "路径不存在" }, { status: 200 });
                 },
                 error: (error) => {
                     Logger.error("服务启动时发生错误", error);