chanjs 2.0.2 → 2.0.4

package/index.js

@@ -29,13 +29,10 @@ class Chan {
     getPackage,
     loadController,
     db,
-    z, //验证器
+    z,
     validator,
-  }; //工具类
+  }; 
   static config = {}; //配置
-  //数据库
-
-  // static Router = express.Router; //路由
   static Service = Service; //服务
   static Controller = Controller; //控制器
   static extend = {}; //组件扩展
@@ -68,10 +65,10 @@ class Chan {
     const {
       views,
       env,
-      appName,
-      version,
+      APP_NAME,
+      APP_VERSION,
       cookieKey,
-      JSON_LIMIT,
+      BODY_LIMIT,
       statics,
       logger,
       cors,
@@ -80,11 +77,11 @@ class Chan {
     log(this.app, logger);
     setFavicon(this.app);
     setCookie(this.app, cookieKey);
-    setBody(this.app, JSON_LIMIT);
+    setBody(this.app, BODY_LIMIT);
     setTemplate(this.app, { views, env });
     setStatic(this.app, statics);
     Cors(this.app, cors);
-    setHeader(this.app, { appName, version });
+    setHeader(this.app, { APP_NAME, APP_VERSION });
   }
 
   //数据库操作

package/middleware/header.js

@@ -1,9 +1,9 @@
-export let setHeader =  (app, { appName, version })=>{
+export let setHeader =  (app, { APP_NAME, APP_VERSION })=>{
   app.use((req, res, next) => {
     res.setHeader("Create-By", "Chanjs");
     res.setHeader("X-Powered-By", "ChanCMS");
-    res.setHeader("ChanCMS", version);
-    res.setHeader("Server", appName);
+    res.setHeader("ChanCMS", APP_VERSION);
+    res.setHeader("Server", APP_NAME);
     next();
   });
 };

package/middleware/setBody.js

@@ -1,6 +1,5 @@
 import express from "express";
 
-
 let setBody = function (app, JSON_LIMIT) {
   app.use(express.json({ limit: JSON_LIMIT }));
   app.use(express.urlencoded({ extended: false }));

package/package.json

@@ -1,7 +1,7 @@
 {
   "type": "module",
   "name": "chanjs",
-  "version": "2.0.2",
+  "version": "2.0.4",
   "description": "chanjs基于express5 纯js研发的轻量级mvc框架。",
   "main": "index.js",
   "module": "index.js",

package/utils/db.js

@@ -1,77 +1,75 @@
-import knex from 'knex';
-
-
-export const db = function({
-  client='mysql2',
-  host='127.0.0.1',
-  user='root',
-  password='123456',
-  database='test',
-  debug=true,
-  charset='utf8mb4',
-  min=0,
-  max=2,
-} ) {
-
+import knex from "knex";
+export const db = function ({
+  client = "mysql2",
+  host = "127.0.0.1",
+  user = "root",
+  password = "123456",
+  database = "test",
+  port = 3306,
+  debug = true,
+  charset = "utf8mb4",
+  min = 0,
+  max = 2,
+}) {
   let config = {
-    client ,
+    client,
     connection: {
-        host ,
-        user ,
-        password,
-        database,
-        charset,
-    } ,
+      host,
+      port,
+      user,
+      password,
+      database,
+      charset,
+    },
     debug,
-    pool: { //默认为{min: 2, max: 10},连接池配置
-        min,
-        max,
-      },
+    pool: {
+      //默认为{min: 2, max: 10},连接池配置
+      min,
+      max,
+    },
     log: {
-        warn(message) {
-          console.error("[knex warn]", message);
-        },
-        error(message) {
-          console.error("[knex error]", message);
-        },
-        debug(message) {
-          console.log("[knex debug]", message);
-        },
-        deprecate(message) {
-          console.warn("[knex deprecate]", message);
-        },
-        trace(message) {
-          console.log("[knex trace]", message);
-        },
-        log(message) {
-          console.log("[knex log]", message);
-        },
-        info(message) {
-          console.log("[knex info]", message);
-        },
-
+      warn(message) {
+        console.error("[knex warn]", message);
+      },
+      error(message) {
+        console.error("[knex error]", message);
+      },
+      debug(message) {
+        console.log("[knex debug]", message);
+      },
+      deprecate(message) {
+        console.warn("[knex deprecate]", message);
+      },
+      trace(message) {
+        console.log("[knex trace]", message);
+      },
+      log(message) {
+        console.log("[knex log]", message);
+      },
+      info(message) {
+        console.log("[knex info]", message);
       },
-}
-    return knex(config);
-}
+    },
+  };
+  return knex(config);
+};
 
 const errCode = {
-  "ECONNREFUSED": "数据库连接被拒绝，请检查数据库服务是否正常运行。",
-  "ER_ACCESS_DENIED_ERROR": "无权限访问，账号或密码错误。",
-  "ER_ROW_IS_REFERENCED_2": "无法删除或更新记录，存在关联数据。",
-  "ER_BAD_FIELD_ERROR": "SQL语句中包含无效字段，请检查查询条件或列名。",
-  "ER_DUP_ENTRY": "插入失败：数据重复，违反唯一性约束。",
-  "ER_NO_SUCH_TABLE": "操作失败：目标表不存在。",
-  "ETIMEOUT": "数据库操作超时，请稍后再试。"
-}
+  ECONNREFUSED: "数据库连接被拒绝，请检查数据库服务是否正常运行。",
+  ER_ACCESS_DENIED_ERROR: "无权限访问，账号或密码错误。",
+  ER_ROW_IS_REFERENCED_2: "无法删除或更新记录，存在关联数据。",
+  ER_BAD_FIELD_ERROR: "SQL语句中包含无效字段，请检查查询条件或列名。",
+  ER_DUP_ENTRY: "插入失败：数据重复，违反唯一性约束。",
+  ER_NO_SUCH_TABLE: "操作失败：目标表不存在。",
+  ETIMEOUT: "数据库操作超时，请稍后再试。",
+};
 const getDefaultErrorMessage = (error) => {
-  if (error.message.includes('syntax') ||
-    error.message.includes('SQL')) {
-    return '数据库语法错误，请检查您的查询语句。';
-  } else if (error.message.includes('Connection closed')) {
-    return '数据库连接已关闭，请重试。';
-  } else if (error.message.includes('permission')) {
-    return '数据库权限不足，请检查配置。';
+  if (error.message.includes("syntax") || error.message.includes("SQL")) {
+    return "数据库语法错误，请检查您的查询语句。";
+  } else if (error.message.includes("Connection closed")) {
+    return "数据库连接已关闭，请重试。";
+  } else if (error.message.includes("permission")) {
+    return "数据库权限不足，请检查配置。";
   }
-  return '数据库发生未知错误，请稍后重试。';
-}
+  return "数据库发生未知错误，请稍后重试。";
+};

package/utils/response.js

@@ -1,26 +1,20 @@
-export let success = (data) => {
-  return {
-    success: true,
-    msg: "�����ɹ�",
-    code: 200,
-    data,
-  };
-};
-
-export let fail = (data, code = 201) => {
-  return {
-    success: false,
-    msg: "����ʧ��",
-    code,
-    data,
-  };
-};
-
-export let err = (data = {}, code = 500) => {
-  return {
-    success: false,
-    msg: "ϵͳ�쳣",
-    code,
-    data,
-  };
-};
+export function parseJsonFields(obj) {
+    const result = {};
+    for (const key in obj) {
+      if (!obj.hasOwnProperty(key)) continue;
+      const value = obj[key];
+      // 如果是字符串，并且看起来像 JSON（以 { 或 [ 开头）
+      if (typeof value === 'string' && (value.startsWith('{') || value.startsWith('['))) {
+        try {
+          result[key] = JSON.parse(value);
+        } catch (e) {
+          console.warn(`JSON parse failed for field: ${key}`, e);
+          result[key] = value; // 保留原始值
+        }
+      } else {
+        result[key] = value;
+      }
+    }
+  
+    return result;
+  }