befly 3.53.0 → 3.55.0

package/apis/tongJi/infoStats.js

@@ -72,10 +72,9 @@ function buildEmptyVisitStats(reportDate, monthStartDate, recentDateList, projec
 
     for (const item of projectLists) {
         products.push({
-            key: item.productCode,
-            productName: item.productName,
-            productCode: item.productCode,
-            productVersion: item.productVersion || "",
+            key: item.code,
+            productName: item.name,
+            productCode: item.code,
             today: 0,
             yesterday: 0,
             dayBeforeYesterday: 0,
@@ -117,13 +116,12 @@ async function buildVisitStatsProducts(befly, now, reportDate, monthStartDate, r
     const products = [];
 
     for (const item of projectLists) {
-        const summary = await getVisitStatsSummary(befly, now, reportDate, monthStartDate, recentDateList, item.productCode);
+        const summary = await getVisitStatsSummary(befly, now, reportDate, monthStartDate, recentDateList, item.code);
 
         products.push({
-            key: item.productCode,
-            productName: item.productName,
-            productCode: item.productCode,
-            productVersion: item.productVersion || "",
+            key: item.code,
+            productName: item.name,
+            productCode: item.code,
             today: summary.today.count,
             yesterday: summary.yesterday.count,
             dayBeforeYesterday: summary.dayBeforeYesterday.count,

package/apis/tongJi/onlineStats.js

@@ -19,11 +19,10 @@ async function buildOnlineStatsProducts(befly, projectLists, now) {
 
     for (const item of projectLists) {
         products.push({
-            key: item.productCode,
-            productName: item.productName,
-            productCode: item.productCode,
-            productVersion: item.productVersion || "",
-            onlineCount: await getOnlineStatsProductOnlineCount(befly, item.productCode, now)
+            key: item.code,
+            productName: item.name,
+            productCode: item.code,
+            onlineCount: await getOnlineStatsProductOnlineCount(befly, item.code, now)
         });
     }
 
@@ -41,10 +40,9 @@ function buildEmptyOnlineStatsProducts(projectLists) {
 
     for (const item of projectLists) {
         products.push({
-            key: item.productCode,
-            productName: item.productName,
-            productCode: item.productCode,
-            productVersion: item.productVersion || "",
+            key: item.code,
+            productName: item.name,
+            productCode: item.code,
             onlineCount: 0
         });
     }

package/checks/config.js

@@ -16,19 +16,14 @@ const projectListCodeSchema = z.string().regex(/^[a-z][a-zA-Z0-9]*$/, "必须是
 const projectListItemSchema = z
     .object({
         code: projectListCodeSchema,
-        name: noTrimString.min(1),
-        productName: noTrimString.min(1),
-        productCode: noTrimString.min(1),
-        productVersion: noTrimString.optional()
+        name: noTrimString.min(1)
     })
     .strict();
 const projectListsSchema = z.array(projectListItemSchema).superRefine((projectLists, ctx) => {
     const codeSet = new Set();
-    const productCodeSet = new Set();
 
     for (let index = 0; index < projectLists.length; index += 1) {
         const code = projectLists[index].code;
-        const productCode = projectLists[index].productCode;
 
         if (codeSet.has(code)) {
             ctx.addIssue({
@@ -36,21 +31,9 @@ const projectListsSchema = z.array(projectListItemSchema).superRefine((projectLi
                 message: `projectLists[${index}].code 重复`,
                 path: [index, "code"]
             });
-            continue;
         }
 
         codeSet.add(code);
-
-        if (productCodeSet.has(productCode)) {
-            ctx.addIssue({
-                code: "custom",
-                message: `projectLists[${index}].productCode 重复`,
-                path: [index, "productCode"]
-            });
-            continue;
-        }
-
-        productCodeSet.add(productCode);
     }
 });
 

package/configs/beflyMenus.json

@@ -52,11 +52,6 @@
                 "name": "字典列表",
                 "path": "/dict",
                 "sort": 2
-            },
-            {
-                "name": "系统配置",
-                "path": "/system",
-                "sort": 3
             }
         ]
     },

package/index.js

@@ -64,6 +64,7 @@ function mergeProjectListsByCode(projectLists) {
 
     for (const item of projectLists) {
         const code = String(item?.code || "");
+        const name = String(item?.name || "");
 
         if (!code) {
             continue;
@@ -73,7 +74,10 @@ function mergeProjectListsByCode(projectLists) {
             itemMap.delete(code);
         }
 
-        itemMap.set(code, item);
+        itemMap.set(code, {
+            code: code,
+            name: name
+        });
     }
 
     return Array.from(itemMap.values());

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "befly",
-    "version": "3.53.0",
+    "version": "3.55.0",
     "gitHead": "49c39d36695036e85fc64083cc43c1652fff96cb",
     "private": false,
     "description": "Befly - 为 Bun 专属打造的 JavaScript API 接口框架核心引擎",

package/apis/sysConfig/all.js

@@ -1,16 +0,0 @@
-export default {
-    name: "获取所有系统配置",
-    method: "POST",
-    body: "none",
-    auth: true,
-    fields: {},
-    required: [],
-    handler: async (befly) => {
-        const result = await befly.mysql.getAll({
-            table: "beflySysConfig",
-            orderBy: ["id#ASC"]
-        });
-
-        return befly.tool.Yes("操作成功", { lists: result.data.lists });
-    }
-};

package/apis/sysConfig/delete.js

@@ -1,36 +0,0 @@
-export default {
-    name: "删除系统配置",
-    method: "POST",
-    body: "none",
-    auth: true,
-    fields: {
-        id: { name: "ID", input: "integer", min: 1, max: null }
-    },
-    required: ["id"],
-    handler: async (befly, ctx) => {
-        try {
-            const config = await befly.mysql.getOne({
-                table: "beflySysConfig",
-                where: { id: ctx.body.id }
-            });
-
-            if (!config.data?.id) {
-                return befly.tool.No("配置不存在");
-            }
-
-            if (config.data.isSystem === 1) {
-                return befly.tool.No("系统配置不允许删除");
-            }
-
-            await befly.mysql.delData({
-                table: "beflySysConfig",
-                where: { id: ctx.body.id }
-            });
-
-            return befly.tool.Yes("操作成功");
-        } catch (error) {
-            befly.logger.error("删除系统配置失败", error);
-            return befly.tool.No("操作失败");
-        }
-    }
-};

package/apis/sysConfig/get.js

@@ -1,37 +0,0 @@
-import sysConfigTable from "#befly/tables/sysConfig.json";
-
-export default {
-    name: "根据代码获取配置值",
-    method: "POST",
-    body: "none",
-    auth: false,
-    fields: {
-        code: sysConfigTable.code
-    },
-    required: ["code"],
-    handler: async (befly, ctx) => {
-        const config = await befly.mysql.getOne({
-            table: "beflySysConfig",
-            where: { code: ctx.body.code }
-        });
-
-        if (!config.data?.id) {
-            return befly.tool.No("配置不存在");
-        }
-
-        let value = config.data.value;
-        if (config.data.valueType === "number") {
-            value = Number(config.data.value);
-        } else if (config.data.valueType === "boolean") {
-            value = config.data.value === "true" || config.data.value === "1";
-        } else if (config.data.valueType === "json") {
-            try {
-                value = JSON.parse(config.data.value);
-            } catch {
-                value = config.data.value;
-            }
-        }
-
-        return befly.tool.Yes("操作成功", { code: config.data.code, value: value });
-    }
-};

package/apis/sysConfig/insert.js

@@ -1,45 +0,0 @@
-import sysConfigTable from "#befly/tables/sysConfig.json";
-
-export default {
-    name: "添加系统配置",
-    method: "POST",
-    body: "none",
-    auth: true,
-    fields: {
-        name: sysConfigTable.name,
-        code: sysConfigTable.code,
-        value: sysConfigTable.value,
-        valueType: sysConfigTable.valueType,
-        group: sysConfigTable.group,
-        sort: sysConfigTable.sort,
-        isSystem: sysConfigTable.isSystem,
-        description: sysConfigTable.description
-    },
-    required: ["name", "code", "value"],
-    handler: async (befly, ctx) => {
-        const existing = await befly.mysql.getOne({
-            table: "beflySysConfig",
-            where: { code: ctx.body.code }
-        });
-
-        if (existing.data?.id) {
-            return befly.tool.No("配置代码已存在");
-        }
-
-        const configId = await befly.mysql.insData({
-            table: "beflySysConfig",
-            data: {
-                name: ctx.body.name,
-                code: ctx.body.code,
-                value: ctx.body.value,
-                valueType: ctx.body.valueType === undefined ? "string" : ctx.body.valueType,
-                group: ctx.body.group === undefined ? "" : ctx.body.group,
-                sort: ctx.body.sort === undefined ? 0 : ctx.body.sort,
-                isSystem: ctx.body.isSystem === undefined ? 0 : ctx.body.isSystem,
-                description: ctx.body.description === undefined ? "" : ctx.body.description
-            }
-        });
-
-        return befly.tool.Yes("操作成功", { id: configId.data });
-    }
-};

package/apis/sysConfig/select.js

@@ -1,30 +0,0 @@
-import { queryFields } from "#befly/apis/_apis.js";
-import sysConfigTable from "#befly/tables/sysConfig.json";
-
-export default {
-    name: "获取系统配置列表",
-    method: "POST",
-    body: "none",
-    auth: true,
-    fields: {
-        ...queryFields,
-        state: sysConfigTable.state
-    },
-    required: [],
-    handler: async (befly, ctx) => {
-        const result = await befly.mysql.getList({
-            table: "beflySysConfig",
-            where: {
-                name$like$or: ctx.body.keyword,
-                code$like$or: ctx.body.keyword,
-                group$like$or: ctx.body.keyword,
-                state: ctx.body.state
-            },
-            page: ctx.body.page,
-            limit: ctx.body.limit,
-            orderBy: ["group#ASC", "sort#ASC", "id#ASC"]
-        });
-
-        return befly.tool.Yes("操作成功", result.data);
-    }
-};

package/apis/sysConfig/update.js

@@ -1,57 +0,0 @@
-import sysConfigTable from "#befly/tables/sysConfig.json";
-
-export default {
-    name: "更新系统配置",
-    method: "POST",
-    body: "none",
-    auth: true,
-    fields: {
-        id: sysConfigTable.id,
-        name: sysConfigTable.name,
-        code: sysConfigTable.code,
-        value: sysConfigTable.value,
-        valueType: sysConfigTable.valueType,
-        group: sysConfigTable.group,
-        sort: sysConfigTable.sort,
-        description: sysConfigTable.description,
-        state: sysConfigTable.state
-    },
-    required: ["id"],
-    handler: async (befly, ctx) => {
-        const config = await befly.mysql.getOne({
-            table: "beflySysConfig",
-            where: { id: ctx.body.id }
-        });
-
-        if (!config.data?.id) {
-            return befly.tool.No("配置不存在");
-        }
-
-        if (config.data.isSystem === 1) {
-            await befly.mysql.updData({
-                table: "beflySysConfig",
-                data: {
-                    value: ctx.body.value
-                },
-                where: { id: ctx.body.id }
-            });
-        } else {
-            await befly.mysql.updData({
-                table: "beflySysConfig",
-                data: {
-                    name: ctx.body.name,
-                    code: ctx.body.code,
-                    value: ctx.body.value,
-                    valueType: ctx.body.valueType,
-                    group: ctx.body.group,
-                    sort: ctx.body.sort,
-                    description: ctx.body.description,
-                    state: ctx.body.state
-                },
-                where: { id: ctx.body.id }
-            });
-        }
-
-        return befly.tool.Yes("操作成功");
-    }
-};

package/tables/sysConfig.json

@@ -1,68 +0,0 @@
-{
-    "id": {
-        "name": "ID",
-        "input": "integer",
-        "min": 1,
-        "max": null
-    },
-    "name": {
-        "name": "配置名称",
-        "min": 2,
-        "max": 50,
-        "input": "string"
-    },
-    "code": {
-        "name": "配置代码",
-        "input": "regexp",
-        "check": "@alphanumeric_",
-        "min": 2,
-        "max": 100
-    },
-    "value": {
-        "name": "配置值",
-        "input": "string"
-    },
-    "valueType": {
-        "name": "值类型",
-        "input": "enum",
-        "check": "string|number|boolean|json",
-        "max": 20
-    },
-    "group": {
-        "name": "配置分组",
-        "input": "string",
-        "max": 50
-    },
-    "sort": {
-        "name": "排序",
-        "input": "number",
-        "max": 9999
-    },
-    "isSystem": {
-        "name": "是否系统配置",
-        "input": "number",
-        "max": 1
-    },
-    "description": {
-        "name": "描述说明",
-        "input": "string",
-        "max": 500
-    },
-    "state": {
-        "name": "状态（0=已删除，1=正常，2=禁用）",
-        "input": "enumInteger",
-        "check": "0|1|2"
-    },
-    "createdAt": {
-        "name": "创建时间",
-        "input": "number"
-    },
-    "updatedAt": {
-        "name": "更新时间",
-        "input": "number"
-    },
-    "deletedAt": {
-        "name": "删除时间",
-        "input": "number"
-    }
-}