chanjs 2.0.18 → 2.0.20

package/core/controller.js

@@ -1,6 +1,10 @@
+
+import {formatTime} from "../helper/time.js";
+
 export default class Controller {
   constructor() {}
-  success(data) {
+
+  success(data){
     return {
       success: true,
       msg: "操作成功",

package/core/service.js

@@ -8,18 +8,21 @@ class Service {
   /**
    * 构造函数
    * @param {Object} knex - Knex实例
-   * @param {string} model - 表名/模型名
+   * @param {string} tableName - 表名
    */
-  constructor(knex, model) {
-    if (!knex || !model) {
-      throw new Error("Service: knex instance and model name are required");
+  constructor(knex, tableName) {
+    if (!knex || !tableName) {
+      throw new Error("Service: knex instance and tableName are required");
     }
 
-    this.knex = knex;
-    this.model = model;
-    this.pageSize = 100;
+    this.db = knex;
+    this.tableName = tableName;
+    this.pageSize = Chan.config?.PAGE_SIZE || 20;
+    this.limit = Chan.config?.LIMIT_MAX || 300;
   }
 
+
+
   /**
    * 查询表所有记录（慎用）
    * @param {Object} query - 查询条件
@@ -27,28 +30,58 @@ class Service {
    */
   async all(query = {}) {
     try {
-      let dbQuery = this.knex(this.model);
-      if (Object.keys(query).length > 0) {
-        dbQuery = dbQuery.where(query);
-      }
-      const res = await dbQuery.select();
+      let _query = this.db(this.tableName);
+      if (Object.keys(query).length) _query = _query.where(query);
+      const res = await _query.select();
       return success(res);
     } catch (err) {
       return error(err);
     }
   }
 
+ /**
+ * 查询所有文档（仅支持对象模式排序）
+ * @param {Object} query - 查询条件，可包含 sort: { field: 'asc|desc' }
+ * @returns {Promise} 查询结果
+ */
+async find(query = {}) {
+  try {
+    let _query = this.db(this.tableName);
+
+    // 解构出排序参数，剩余作为 where 条件
+    const { sort, ...whereConditions } = query;
+
+    // 应用 where 条件
+    if (Object.keys(whereConditions).length > 0) {
+      _query = _query.where(whereConditions);
+    }
+
+    // 应用排序（仅支持对象模式）
+    if (sort && typeof sort === 'object') {
+      for (const [field, dir] of Object.entries(sort)) {
+        const direction = ['asc', 'desc'].includes(dir.toLowerCase()) 
+          ? dir.toLowerCase() 
+          : 'asc'; // 默认升序
+        _query = _query.orderBy(field, direction);
+      }
+    }
+
+    const res = await _query.select();
+    return success(res);
+  } catch (err) {
+    return error(err);
+  }
+}
+
   /**
    * 获取单个记录
    * @param {Object} query - 查询条件
    * @returns {Promise} 查询结果
    */
-  async one(query = {}) {
+  async findOne(query = {}) {
     try {
-      let dbQuery = this.knex(this.model);
-      if (Object.keys(query).length > 0) {
-        dbQuery = dbQuery.where(query);
-      }
+      let dbQuery = this.db(this.tableName);
+      if (Object.keys(query).length) dbQuery = dbQuery.where(query);
       const res = await dbQuery.first();
       return success(res);
     } catch (err) {
@@ -60,35 +93,30 @@ class Service {
    * 根据ID查询记录
    * @param {Object} options - 查询选项
    * @param {Object} options.query - 查询条件
-   * @param {Array} options.field - 返回字段
-   * @param {number} options.len - 返回数量
+   * @param {Array}  options.field - 返回字段
    */
-  async findById({ query, field = [], len = 1 }) {
+  async findById({ query, field = [] }) {
     try {
-      let dataQuery = this.knex(this.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 success(res || (len === 1 ? {} : []));
+      let _query = this.db(this.tableName).where(query);
+      if (field.length) _query = _query.select(field);
+      const res = await _query.first();
+      return success(res);
     } catch (err) {
       return error(err);
     }
   }
 
+ 
   /**
    * 创建新记录
-   * @param {Object} data - 包含要插入的数据对象
+   * @param {Object} data - 要插入的数据
    * @returns {Promise} 操作结果
    */
   async insert(data = {}) {
     try {
-      if (Object.keys(data).length === 0) {
-        return fail(CODE[2002], { code: 2002 });
-      }
-      const result = await this.knex(this.model).insert(data);
-      return success(result?.length > 0 || !!result);
+      if (!Object.keys(data).length) return fail(CODE[2002], { code: 2002 });
+      const result = await this.db(this.tableName).insert(data);
+      return success(result);
     } catch (err) {
       return error(err);
     }
@@ -96,15 +124,13 @@ class Service {
 
   /**
    * 插入多条记录
-   * @param {Array} records - 包含要插入的数据对象数组
+   * @param {Array} records - 数据数组
    * @returns {Promise} 操作结果
    */
   async insertMany(records = []) {
     try {
-      if (records.length === 0) {
-        return fail(CODE[2002], { code: 2002 });
-      }
-      const result = await this.knex(this.model).insert(records);
+      if (!records.length) return fail(CODE[2002], { code: 2002 });
+      const result = await this.db(this.tableName).insert(records);
       return success(result);
     } catch (err) {
       return error(err);
@@ -112,16 +138,14 @@ class Service {
   }
 
   /**
-   * 根据指定条件删除记录
-   * @param {Object} query - 包含查询条件的对象
+   * 根据条件删除记录
+   * @param {Object} query - 查询条件
    * @returns {Promise} 操作结果
    */
   async delete(query = {}) {
     try {
-      if (Object.keys(query).length === 0) {
-        return fail(CODE[2002], { code: 2002 });
-      }
-      const affectedRows = await this.knex(this.model).where(query).del();
+      if (!Object.keys(query).length) return fail(CODE[2002], { code: 2002 });
+      const affectedRows = await this.db(this.tableName).where(query).del();
       return success(affectedRows > 0);
     } catch (err) {
       return error(err);
@@ -129,7 +153,7 @@ class Service {
   }
 
   /**
-   * 根据指定条件更新记录
+   * 根据条件更新记录
    * @param {Object} options - 更新选项
    * @param {Object} options.query - 查询条件
    * @param {Object} options.params - 更新数据
@@ -137,10 +161,10 @@ class Service {
    */
   async update({ query, params } = {}) {
     try {
-      if (!query || !params || Object.keys(query).length === 0) {
+      if (!query || !params || !Object.keys(query).length) {
         return fail(CODE[2001], { code: 2001 });
       }
-      const result = await this.knex(this.model).where(query).update(params);
+      const result = await this.db(this.tableName).where(query).update(params);
       return success(!!result);
     } catch (err) {
       return error(err);
@@ -148,21 +172,27 @@ class Service {
   }
 
   /**
-   * 批量更新多条记录
-   * @param {Array} updates - 更新操作数组
+   * 批量更新多条记录（事务）
+   * @param {Array} updates - [{ query, params }, ...]
    * @returns {Promise} 操作结果
    */
   async updateMany(updates = []) {
-    if (!Array.isArray(updates) || updates.length === 0) {
+    if (!Array.isArray(updates) || !updates.length) {
       return fail(CODE[2002], { code: 2002 });
     }
 
-    const trx = await this.knex.transaction();
+    const trx = await this.db.transaction();
     try {
       for (const { query, params } of updates) {
-        const result = await trx(this.model).where(query).update(params);
+        // FIX-4 防止空条件全表更新
+        if (!query || !Object.keys(query).length) {
+          await trx.rollback();
+          return fail('批量更新不允许空条件');
+        }
+        const result = await trx(this.tableName).where(query).update(params);
         if (result === 0) {
           await trx.rollback();
+          console.warn('[updateMany] 未匹配到行, query=%j', query); // FIX-3 日志
           return fail(`更新失败: ${JSON.stringify(query)}`);
         }
       }
@@ -174,37 +204,41 @@ class Service {
     }
   }
 
+
   /**
    * 分页查询
    * @param {Object} options - 查询选项
-   * @param {number} options.current - 当前页码
-   * @param {number} options.pageSize - 每页大小
-   * @param {Object} options.query - 查询条件
-   * @param {Array} options.field - 返回字段
+   * @param {number} options.current  - 当前页
+   * @param {number} options.pageSize - 每页条数
+   * @param {Object} options.query    - 查询条件
+   * @param {Array}  options.field    - 返回字段
    * @returns {Promise} 查询结果
    */
   async query({ current = 1, pageSize = 10, query = {}, field = [] }) {
     try {
-      const offset = (current - 1) * pageSize;
-      let countQuery = this.knex(this.model).count("* as total");
-      let dataQuery = this.knex(this.model);
-
-      if (Object.keys(query).length > 0) {
-        Object.entries(query).forEach(([key, value]) => {
-          countQuery = countQuery.where(key, value);
-          dataQuery = dataQuery.where(key, value);
+      const size = pageSize; // 如需要可再做非空校验
+      const offset = (current - 1) * size;
+
+      let countQuery = this.db(this.tableName).count("* as total");
+      let dataQuery  = this.db(this.tableName);
+
+      if (Object.keys(query).length) {
+        Object.entries(query).forEach(([k, v]) => {
+          countQuery = countQuery.where(k, v);
+          dataQuery  = dataQuery.where(k, v);
         });
       }
 
-      if (field.length > 0) dataQuery = dataQuery.select(field);
+      if (field && field.length) dataQuery = dataQuery.select(field);
 
       const [totalResult, list] = await Promise.all([
         countQuery.first(),
-        dataQuery.offset(offset).limit(pageSize),
+        dataQuery.offset(offset).limit(size),
       ]);
 
-      const total = totalResult?.total || 0;
-      return success({ list, total, current, pageSize });
+      // FIX-1 显式转数字，防止字符串 "0"
+      const total = Number(totalResult?.total ?? 0);
+      return success({ list, total, current, pageSize: size });
     } catch (err) {
       return error(err);
     }
@@ -212,21 +246,51 @@ class Service {
 
   /**
    * 计数查询
-   * @param {Array} query - 查询条件数组
+   * @param {Object} query - 查询条件
    * @returns {Promise} 查询结果
    */
-  async count(query = []) {
+  async count(query = {}) {
     try {
-      let dataQuery = this.knex(this.model);
-      if (query.length > 0) {
-        query.forEach((condition) => (dataQuery = dataQuery.where(condition)));
-      }
+      let dataQuery = this.db(this.tableName);
+      if (Object.keys(query).length) dataQuery = dataQuery.where(query);
       const result = await dataQuery.count("* as total").first();
-      return success(Number(result?.total) || 0);
+      return success(Number(result?.total ?? 0));
+    } catch (err) {
+      return error(err);
+    }
+  }
+
+  /**
+   * 多表关联查询
+   * @param {Object} query - 关联配置
+   * @returns {Promise} 查询结果
+   */
+  async join(query) {
+    try {
+      const {
+        joinTable,
+        localField,
+        foreignField,
+        select = "*",
+        where = {},
+      } = query;
+
+      let _query = this.db(this.tableName)
+        .join(
+          joinTable,
+          `${this.tableName}.${localField}`,
+          "=",
+          `${joinTable}.${foreignField}`
+        )
+        .select(select);
+
+      if (Object.keys(where).length) _query = _query.where(where);
+      const res = await _query;
+      return success(res);
     } catch (err) {
       return error(err);
     }
   }
 }
 
-export default Service;
+export default Service;

package/global/global.js

@@ -1,15 +1,26 @@
-import { pathToFileURL, fileURLToPath } from "url";
 import path from "path";
+import { readFileSync } from "fs";
+import { pathToFileURL, fileURLToPath } from "url";
+
 const ROOT_PATH = process.cwd();
 const APP_PATH = path.join(ROOT_PATH, "app");
 const __filename = fileURLToPath(import.meta.url);
 const __dirname = path.dirname(__filename);
 
+const getVersion = () => {
+  const packageJsonPath = path.join(ROOT_PATH, "package.json");
+  const packageJson = JSON.parse(
+    readFileSync(packageJsonPath, "utf8")
+  );
+  return packageJson?.version || "1.0.0";
+};
+
 const globals = {
   __dirname,
   __filename,
   ROOT_PATH,
   APP_PATH,
+  APP_VERSION: getVersion(),
   CONFIG_PATH: path.join(ROOT_PATH, "config"),
   EXTEND_PATH: path.join(APP_PATH, "extend"),
   PUBLIC_PATH: path.join(ROOT_PATH, "public"),

package/helper/index.js

@@ -1,4 +1,5 @@
 import { db } from "./db.js";
 import { loaderSort, loadConfig } from "./loader.js";
+import { formatTime, formatDateFields } from "./time.js";
 
-export { db, loaderSort, loadConfig };
+export { db, loaderSort, loadConfig, formatTime, formatDateFields };

package/helper/loader.js

@@ -48,6 +48,26 @@ export const loadConfig = async function () {
   return config;
 };
 
+/**
+ * 绑定已实例化对象的方法
+ * @param {Object} instance - 已实例化的对象
+ * @returns {Object} 绑定方法后的对象
+ */
+export const bindInstance = function (instance) {
+  Object.getOwnPropertyNames(Object.getPrototypeOf(instance)).forEach(
+    (methodName) => {
+      if (
+        methodName !== "constructor" &&
+        typeof instance[methodName] === "function"
+      ) {
+        instance[methodName] = instance[methodName].bind(instance);
+      }
+    }
+  );
+  return instance;
+};
+
+
 /**
  * 加载指定模块名下的所有控制器文件
  * @param {string} moduleName - 模块名称
@@ -67,17 +87,15 @@ export const loadController = async function (moduleName) {
 
   for (const file of files) {
     const filePath = path.join(dir, file);
-    const name = file.replace(/\.js$/i, ""); // 安全处理 .js 后缀
+    const name = file.replace(/\.js$/i, "");
 
     try {
       const module = await importFile(filePath);
-      let obj = module.default || module;
-
-      controller[name] = obj;
+      let obj = module?.default || module;
+      // 使用 bindClass 确保方法绑定了正确的 this
+      controller[name] = bindInstance(obj);
     } catch (e) {
       console.error(`加载控制器失败: ${filePath}`, e);
-      // 可选：抛出错误或继续加载其他文件
-      // throw e;
     }
   }
 

package/helper/time.js

@@ -24,5 +24,51 @@ export const formatDay = (data, time = true, format = "YYYY-MM-DD") => {
 };
 
 export const formatTime = (data, format = "YYYY-MM-DD HH:mm:ss") => {
-  return dayjs(data).format("YYYY-MM-DD HH:mm:ss");
+  return dayjs(data).format(format);
 };
+
+/**
+ * 格式化对象或数组中的日期字段
+ * @param {Object|Array} data - 要格式化的数据
+ * @param {Object} options - 配置选项
+ * @param {Array} options.fields - 要格式化的字段名，默认 ['createdAt', 'updatedAt']
+ * @param {String} options.format - 日期格式，默认 'YYYY-MM-DD HH:mm:ss'
+ * @returns {Object|Array} - 格式化后的数据
+ */
+export const formatDateFields = (data, options = {}) => {
+  const {
+    fields = ['createdAt', 'updatedAt'],
+    format = 'YYYY-MM-DD HH:mm:ss',
+  } = options;
+
+  const isPlainObject = (val) =>
+    Object.prototype.toString.call(val) === '[object Object]';
+
+  if (isPlainObject(data)) {
+    const result = { ...data };
+    fields.forEach(field => {
+      const value = result[field];
+      if (value != null) {
+        const type = typeof value;
+        if (type === 'string' || type === 'number' || value instanceof Date) {
+          try {
+            result[field] = formatTime(value, format);
+          } catch (e) {
+            console.warn(`格式化字段 ${field} 失败:`, e.message);
+          }
+        }
+      }
+    });
+    return result;
+  }
+
+  if (Array.isArray(data)) {
+    return data.map(item =>
+      typeof item === 'object' && item !== null
+        ? formatDateFields(item, options)
+        : item
+    );
+  }
+
+  return data;
+};;

package/index.js

@@ -21,7 +21,7 @@ import { dirname } from "./helper/file.js";
 
 class Chan {
   //版本号
-  #version = "0.0.0";
+  #version = "1.0.0";
   static helper = {};
   static common = {}; //公共方法
   static config = {}; //配置
@@ -29,7 +29,7 @@ class Chan {
   static Controller = Controller; //控制器
   static extend = {}; //组件扩展
   static middleware = {}; //中间件
-
+  static modules = {}; //模块
 
   constructor() {
     this.app = express();
@@ -50,6 +50,8 @@ class Chan {
   //加载配置文件
   async config() {
     let config = await loadConfig();
+    //版本号，先从package.json中获取，如果没有，则使用默认版本号
+    config.APP_VERSION = APP_VERSION || config.APP_VERSION;
     Chan.config = config;
   }
 
@@ -165,7 +167,6 @@ class Chan {
         methods: Object.keys(r.route.methods),
       }));
 
-    console.log(routes);
   }
 
   run(cb) {

package/package.json

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