chanjs 2.0.8 → 2.0.9

package/helper/db.js

@@ -46,6 +46,13 @@ export const db =({
       //默认为{min: 2, max: 10},连接池配置
       min,
       max,
+       // 添加连接池错误处理
+       afterCreate: (conn, done) => {
+        conn.on('error', (error) => {
+          console.error(`[连接池错误] 连接出错: ${getDefaultErrorMessage(error)}`, error);
+        });
+        done(null, conn);
+      }
     },
     log: {
       warn(message) {
@@ -71,5 +78,6 @@ export const db =({
       },
     },
   };
+
   return knex(config);
 };

package/helper/sign.js

@@ -0,0 +1,33 @@
+import CryptoJS from "crypto-js";
+
+/**
+ * AES加密
+ * @param message 要加密的字符串
+ * @param key 加密密钥
+ * @returns 加密后的字符串，加密失败返回空字符串
+ */
+export const aesEncrypt = (obj, key = Chan.config.AES_SALT) => {
+  try {
+    const encrypted = CryptoJS.AES.encrypt(JSON.stringify(obj), key);
+    return encrypted.toString();
+  } catch (error) {
+    console.error("AES加密失败:", error);
+    return "";
+  }
+};
+
+/**
+ * AES解密
+ * @param encryptedMessage 要解密的字符串
+ * @param key 解密密钥（必须与加密时使用的密钥相同）
+ * @returns 解密后的原始字符串，解密失败返回空字符串
+ */
+export const aesDecrypt = (str, key = Chan.config.AES_SALT) => {
+  try {
+    const decrypted = CryptoJS.AES.decrypt(str, key);
+    return decrypted.toString(CryptoJS.enc.Utf8);
+  } catch (error) {
+    console.error("AES解密失败:", error);
+    return "";
+  }
+};

package/index.js

@@ -76,7 +76,6 @@ class Chan {
     setStatic(this.app, statics);
     Cors(this.app, cors);
     setHeader(this.app, { APP_NAME, APP_VERSION });
-   
   }
 
   //数据库操作

package/package.json

@@ -1,7 +1,7 @@
 {
   "type": "module",
   "name": "chanjs",
-  "version": "2.0.8",
+  "version": "2.0.9",
   "description": "chanjs基于express5 纯js研发的轻量级mvc框架。",
   "main": "index.js",
   "module": "index.js",
@@ -30,7 +30,6 @@
     "knex": "^3.1.0",
     "morgan": "^1.10.0",
     "mysql2": "^3.14.1",
-    "schedule": "^0.5.0",
-    "zod": "^4.0.5"
+    "schedule": "^0.5.0"
   }
 }

package/core/service copy.js

@@ -1,217 +0,0 @@
-import {CODE,DB_ERROR} from "../config/code.js";
-
-// 响应工具函数
-const createResponse = (success, data, msg, code) => ({
-  success,
-  data: data || (success ? {} : null),
-  msg: msg || (success ? CODE[200] : CODE[1001]),
-  code: code || (success ? 200 : 1001)
-});
-
-const successResponse = (data, msg) => createResponse(true, data, msg);
-const failResponse = (msg, data, code) => createResponse(false, data, msg, code);
-
-// 错误处理函数
-const getDefaultErrorCode = (error) => {
-  if (error.message.includes('syntax') || error.message.includes('SQL')) {
-    return 6008;
-  } else if (error.message.includes('Connection closed')) {
-    return 6009;
-  } else if (error.message.includes('permission')) {
-    return 3003;
-  }
-  return 5001;
-};
-
-const handleError = (err) => {
-  console.error('Database Error:', err);
-  const errorCode = DB_ERROR[err.code] || getDefaultErrorCode(err);
-  
-  return failResponse(
-    CODE[errorCode],
-    { sql: err.sql, sqlMessage: err.sqlMessage },
-    errorCode
-  );
-};
-
-// 基础查询构建函数
-const buildQuery = (knex, model, query = {}) => {
-  let dbQuery = knex(model);
-  if (Object.keys(query).length > 0) {
-    dbQuery = dbQuery.where(query);
-  }
-  return dbQuery;
-};
-
-/**
- * 查询表所有记录（慎用）
- */
-export const all = async (knex, model, query = {}) => {
-  try {
-    const res = await buildQuery(knex, model, query).select();
-    return successResponse(res);
-  } catch (err) {
-    return handleError(err);
-  }
-};
-
-/**
- * 获取单个记录
- */
-export const one = async (knex, model, query = {}) => {
-  try {
-    const res = await buildQuery(knex, model, query).first();
-    return successResponse(res);
-  } catch (err) {
-    return handleError(err);
-  }
-};
-
-/**
- * 根据条件查询记录
- */
-export const findById = async (knex, model, { query = {}, field = [], len = 1 }) => {
-  try {
-    let dataQuery = knex(model).where(query);
-    
-    if (field.length > 0) dataQuery = dataQuery.select(field);
-    if (len === 1) dataQuery = dataQuery.first();
-    else if (len > 1) dataQuery = dataQuery.limit(len);
-    
-    const res = await dataQuery;
-    return successResponse(res || (len === 1 ? {} : []));
-  } catch (err) {
-    return handleError(err);
-  }
-};
-
-/**
- * 创建新记录
- */
-export const insert = async (knex, model, data = {}) => {
-  try {
-    if (Object.keys(data).length === 0) {
-      return failResponse(CODE[2002], null, 2002);
-    }
-    const result = await knex(model).insert(data);
-    return successResponse(result?.length > 0 || !!result);
-  } catch (err) {
-    return handleError(err);
-  }
-};
-
-/**
- * 插入多条记录
- */
-export const insertMany = async (knex, model, records = []) => {
-  try {
-    if (records.length === 0) {
-      return failResponse(CODE[2002], null, 2002);
-    }
-    const result = await knex(model).insert(records);
-    return successResponse(result);
-  } catch (err) {
-    return handleError(err);
-  }
-};
-
-/**
- * 根据指定条件删除记录
- */
-export const del = async (knex, model, query = {}) => {
-  try {
-    if (Object.keys(query).length === 0) {
-      return failResponse(CODE[2002], null, 2002);
-    }
-    const affectedRows = await knex(model).where(query).del();
-    return successResponse(affectedRows > 0);
-  } catch (err) {
-    return handleError(err);
-  }
-};
-
-/**
- * 根据指定条件更新记录
- */
-export const update = async (knex, model, query = {}, params = {}) => {
-  try {
-    if (Object.keys(query).length === 0 || Object.keys(params).length === 0) {
-      return failResponse(CODE[2001], null, 2001);
-    }
-    const result = await knex(model).where(query).update(params);
-    return successResponse(!!result);
-  } catch (err) {
-    return handleError(err);
-  }
-};
-
-/**
- * 批量更新多条记录
- */
-export const updateMany = async (knex, model, updates = []) => {
-  if (!Array.isArray(updates) || updates.length === 0) {
-    return failResponse(CODE[2002], null, 2002);
-  }
-  
-  const trx = await knex.transaction();
-  try {
-    for (const { query, params } of updates) {
-      const result = await trx(model).where(query).update(params);
-      if (result === 0) {
-        await trx.rollback();
-        return failResponse(`更新失败: ${JSON.stringify(query)}`);
-      }
-    }
-    await trx.commit();
-    return successResponse(true);
-  } catch (err) {
-    await trx.rollback();
-    return handleError(err);
-  }
-};
-
-/**
- * 分页查询
- */
-export const query = async (knex, model, { current = 1, pageSize = 10, query = {}, field = [] }) => {
-  try {
-    const offset = (current - 1) * pageSize;
-    let countQuery = knex(model).count("* as total");
-    let dataQuery = knex(model);
-    
-    if (Object.keys(query).length > 0) {
-      Object.entries(query).forEach(([key, value]) => {
-        countQuery = countQuery.where(key, value);
-        dataQuery = dataQuery.where(key, value);
-      });
-    }
-
-    if (field.length > 0) dataQuery = dataQuery.select(field);
-
-    const [totalResult, list] = await Promise.all([
-      countQuery.first(),
-      dataQuery.offset(offset).limit(pageSize)
-    ]);
-
-    const total = totalResult?.total || 0;
-    return successResponse({ list, total, current, pageSize });
-  } catch (err) {
-    return handleError(err);
-  }
-};
-
-/**
- * 计数查询
- */
-export const count = async (knex, model, query = []) => {
-  try {
-    let dataQuery = knex(model);
-    if (query.length > 0) {
-      query.forEach(condition => dataQuery = dataQuery.where(condition));
-    }
-    const result = await dataQuery.count("* as total").first();
-    return successResponse(Number(result?.total) || 0);
-  } catch (err) {
-    return handleError(err);
-  }
-};

package/helper/validate.js

@@ -1,2 +0,0 @@
-import { z } from "zod";
-export { z };