befly 3.22.0 → 3.22.2

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.publicHost}${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,
+        publicHost: 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",
-
+    "publicHost": "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);

package/package.json

@@ -1,7 +1,7 @@
 {
     "name": "befly",
-    "version": "3.22.0",
-    "gitHead": "f3fd845d4fdbbf0db38a4e676162f3d710a9ce5b",
+    "version": "3.22.2",
+    "gitHead": "89a9ea96f129aa223da7a627ec8e7fb572438292",
     "private": false,
     "description": "Befly - 为 Bun 专属打造的 JavaScript API 接口框架核心引擎",
     "keywords": [

package/paths.js

@@ -112,9 +112,9 @@ export const appApiDir = join(appDir, "apis");
 export const appTableDir = join(appDir, "tables");
 
 /**
- * 项目公共静态目录
+ * 项目上传/公共文件目录
  * @description 默认 {appDir}/public，可通过 config.publicDir 覆盖
- * @usage 用于静态文件访问与本地上传保存目录解析
+ * @usage 用于本地上传文件保存目录解析，不承担 HTTP 静态托管职责
  */
 export function getAppPublicDir(publicDir = "./public") {
     if (isAbsolute(publicDir)) {

package/router/static.js

@@ -20,7 +20,8 @@ export function staticHandler(corsConfig = undefined, publicDir = "./public") {
         const corsHeaders = setCorsOptions(req, corsConfig);
 
         const url = new URL(req.url);
-        const filePath = join(getAppPublicDir(publicDir), url.pathname);
+        const publicPath = url.pathname.replace(/^\/public/, "") || "/";
+        const filePath = join(getAppPublicDir(publicDir), publicPath);
 
         try {
             // OPTIONS预检请求

package/sql/befly.sql

@@ -79,6 +79,26 @@ CREATE TABLE IF NOT EXISTS `befly_email_log` (
     PRIMARY KEY (`id`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci;
 
+CREATE TABLE IF NOT EXISTS `befly_file` (
+    `id` BIGINT NOT NULL,
+    `user_id` BIGINT NOT NULL DEFAULT 0,
+    `file_path` VARCHAR(500) NOT NULL DEFAULT '',
+    `url` VARCHAR(1000) NOT NULL DEFAULT '',
+    `is_image` TINYINT NOT NULL DEFAULT 0,
+    `file_type` VARCHAR(20) NOT NULL DEFAULT '',
+    `file_size` BIGINT NOT NULL DEFAULT 0,
+    `file_key` VARCHAR(100) NOT NULL DEFAULT '',
+    `file_ext` VARCHAR(20) NOT NULL DEFAULT '',
+    `file_name` VARCHAR(200) NOT NULL DEFAULT '',
+    `state` TINYINT NOT NULL DEFAULT 1,
+    `created_at` BIGINT NOT NULL DEFAULT 0,
+    `updated_at` BIGINT NOT NULL DEFAULT 0,
+    `deleted_at` BIGINT NULL DEFAULT NULL,
+    PRIMARY KEY (`id`),
+    KEY `idx_befly_file_user_id` (`user_id`),
+    KEY `idx_befly_file_is_image` (`is_image`) 
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci;
+
 CREATE TABLE IF NOT EXISTS `befly_login_log` (
     `id` BIGINT NOT NULL,
     `admin_id` BIGINT NOT NULL DEFAULT 0,

package/tables/file.json

@@ -0,0 +1,81 @@
+{
+    "id": {
+        "name": "ID",
+        "input": "integer",
+        "min": 1,
+        "max": null
+    },
+    "state": {
+        "name": "状态",
+        "input": "integer",
+        "min": 0,
+        "max": 2
+    },
+    "createdAt": {
+        "name": "创建时间",
+        "input": "number"
+    },
+    "updatedAt": {
+        "name": "更新时间",
+        "input": "number"
+    },
+    "deletedAt": {
+        "name": "删除时间",
+        "input": "number"
+    },
+    "userId": {
+        "name": "用户ID",
+        "input": "integer",
+        "min": 1,
+        "max": null
+    },
+    "filePath": {
+        "name": "文件路径",
+        "input": "string",
+        "min": 1,
+        "max": 500
+    },
+    "url": {
+        "name": "文件地址",
+        "input": "string",
+        "min": 1,
+        "max": 1000
+    },
+    "isImage": {
+        "name": "是否图片",
+        "input": "integer",
+        "min": 0,
+        "max": 1
+    },
+    "fileType": {
+        "name": "文件类型",
+        "input": "enum",
+        "check": "image|video|audio|file",
+        "min": 4,
+        "max": 5
+    },
+    "fileSize": {
+        "name": "文件大小",
+        "input": "integer",
+        "min": 0,
+        "max": null
+    },
+    "fileKey": {
+        "name": "文件标识",
+        "input": "string",
+        "min": 1,
+        "max": 100
+    },
+    "fileExt": {
+        "name": "文件扩展名",
+        "input": "string",
+        "min": 1,
+        "max": 20
+    },
+    "fileName": {
+        "name": "文件名",
+        "input": "string",
+        "min": 1,
+        "max": 200
+    }
+}

package/utils/datetime.js

@@ -1,38 +1,24 @@
-const visitStatsDateFormatter = new Intl.DateTimeFormat("en-CA", {
+const ymdNumberFormatter = new Intl.DateTimeFormat("en-CA", {
     year: "numeric",
     month: "2-digit",
     day: "2-digit"
 });
 
-export const DAY_MS = 24 * 60 * 60 * 1000;
-
-function toDate(value = Date.now()) {
-    if (value instanceof Date) {
-        return value;
-    }
-
-    return Reflect.construct(Date, [value]);
-}
-
-function padDatePart(value) {
-    if (value < 10) {
-        return `0${value}`;
-    }
+const monthDirFormatterCache = new Map();
 
-    return String(value);
-}
+export const DAY_MS = 24 * 60 * 60 * 1000;
 
 export function addDays(timestamp = Date.now(), days = 0) {
     return Number(timestamp || 0) + Number(days || 0) * DAY_MS;
 }
 
 export function getDateYmdNumber(timestamp = Date.now()) {
-    return Number(visitStatsDateFormatter.format(timestamp).replace(/[^0-9]/g, ""));
+    return Number(ymdNumberFormatter.format(timestamp).replace(/[^0-9]/g, ""));
 }
 
 export function getDayStartTime(timestamp = Date.now()) {
-    const date = toDate(timestamp);
-    return Reflect.construct(Date, [date.getFullYear(), date.getMonth(), date.getDate(), 0, 0, 0, 0]).getTime();
+    const date = new Date(timestamp);
+    return new Date(date.getFullYear(), date.getMonth(), date.getDate(), 0, 0, 0, 0).getTime();
 }
 
 export function getDayEndTime(timestamp = Date.now()) {
@@ -49,20 +35,31 @@ export function getTimeBucketStart(timestamp = Date.now(), bucketMs = 0) {
     return time - (time % bucket);
 }
 
+export function getMonthDir(value = Date.now(), timeZone = "Asia/Shanghai") {
+    const zone = typeof timeZone === "string" && timeZone.trim().length > 0 ? timeZone.trim() : "Asia/Shanghai";
+
+    if (!monthDirFormatterCache.has(zone)) {
+        monthDirFormatterCache.set(
+            zone,
+            new Intl.DateTimeFormat("sv-SE", {
+                timeZone: zone,
+                year: "numeric",
+                month: "2-digit"
+            })
+        );
+    }
+
+    return monthDirFormatterCache.get(zone).format(value).replace("-", "");
+}
+
 export function formatYmdHms(value = Date.now(), format = "dateTime") {
-    const date = toDate(value);
+    const date = new Date(value);
     const y = date.getFullYear();
-    const m = date.getMonth() + 1;
-    const d = date.getDate();
-    const h = date.getHours();
-    const mi = date.getMinutes();
-    const s = date.getSeconds();
-
-    const mm = padDatePart(m);
-    const dd = padDatePart(d);
-    const hh = padDatePart(h);
-    const mii = padDatePart(mi);
-    const ss = padDatePart(s);
+    const mm = String(date.getMonth() + 1).padStart(2, "0");
+    const dd = String(date.getDate()).padStart(2, "0");
+    const hh = String(date.getHours()).padStart(2, "0");
+    const mii = String(date.getMinutes()).padStart(2, "0");
+    const ss = String(date.getSeconds()).padStart(2, "0");
 
     if (format === "date") {
         return `${y}-${mm}-${dd}`;