chanjs 1.1.3 → 1.1.4

package/core/lib/extend.js

@@ -5,6 +5,9 @@ export default (app)=>{
             app.use(prefix, express.static(dir, { maxAge: maxAge || 0 }));
         }
     }
+
+ 
 }
 
+
  

package/core/lib/service.js

@@ -3,8 +3,9 @@ class BaseService {
    * @description 构造函数
    * @param {*} knex - knex实例
    */
-  constructor() {
-    this.knex = Chan.knex || null;
+  constructor(DB=Chan.knex) {
+    this.knex = DB;
+    this.DB = DB;
     this.model = ''; // 默认为空字符串
   }
 
@@ -15,9 +16,9 @@ class BaseService {
    */
   all(query={}) {
     if(Object.keys(query).length === 0) {
-      return this.knex(this.model).select();
+      return this.DB(this.model).select();
     }
-    return this.knex(this.model).where(query).select();
+    return this.DB(this.model).where(query).select();
   }
 
  /**
@@ -30,7 +31,7 @@ class BaseService {
  * @returns {Promise} 返回匹配条件的记录或记录列表
  */
 async findById({ query, field = [], len = 1 }) {
-  let dataQuery = this.knex(this.model).where(query);
+  let dataQuery = this.DB(this.model).where(query);
 
   // 字段筛选
   if (field.length > 0) {
@@ -58,7 +59,7 @@ async insert(data = {}) {
   if (Object.keys(data).length === 0) {
     return false;
   }
-  const result = await this.knex(this.model).insert(data);
+  const result = await this.DB(this.model).insert(data);
   return result?.length > 0 || !!result;
 }
 
@@ -75,7 +76,7 @@ async insert(data = {}) {
     }
   
     // 执行插入操作并获取结果
-    const result = await this.knex(this.model).insert(records);
+    const result = await this.DB(this.model).insert(records);
   
     // 返回插入的结果
     return result;
@@ -90,7 +91,7 @@ async insert(data = {}) {
   if (Object.keys(query).length === 0) {
     return false;
   }
-  const affectedRows = await this.knex(this.model).where(query).del();
+  const affectedRows = await this.DB(this.model).where(query).del();
   return affectedRows > 0;
 }
 /**
@@ -100,7 +101,7 @@ async insert(data = {}) {
  * @returns {Promise<boolean>} 返回操作是否成功
  */
 async  update({query, params} = {}) {
-    const result = await this.knex(this.model).where(query).update(params);
+    const result = await this.DB(this.model).where(query).update(params);
     return { affectedRows: result };
 }
 
@@ -117,7 +118,7 @@ async updateMany(updates = []) {
   }
 
   // 获取事务对象
-  const trx = await this.knex.transaction();
+  const trx = await this.DB.transaction();
   
   try {
       const affectedRows = [];
@@ -155,8 +156,8 @@ async updateMany(updates = []) {
  */
  async query({current = 1, pageSize = 10, query = {},field = []}) {
   const offset = (current - 1) * pageSize;
-  let countQuery = this.knex(this.model).count("* as total");
-  let dataQuery = this.knex(this.model);
+  let countQuery = this.DB(this.model).count("* as total");
+  let dataQuery = this.DB(this.model);
   // 应用查询条件
   if(Object.keys(query).length > 0){
     Object.entries(query).forEach(([key, value]) => {
@@ -185,7 +186,7 @@ async updateMany(updates = []) {
  * @returns {Promise<number>} 返回符合条件的记录数量
  */
   async count(query=[]) {
-      let dataQuery = this.knex(this.model);
+      let dataQuery = this.DB(this.model);
       if(query.length >0){
         query.forEach((condition) => {
             dataQuery = dataQuery.where(condition);

package/core/lib/view.js

@@ -1,7 +1,6 @@
 import path from "path";
 import dayjs from 'dayjs';
 import { createRequire } from 'module';
-
 const require = createRequire(import.meta.url);
 
 const template = require("art-template");

package/index.js

@@ -6,7 +6,7 @@ import { pathToFileURL } from 'url';  // 新增顶部导入
 import config from "./core/config.js";
 import {bindClass,createKnex,loadWebToEnd} from "./core/helper.js";
 
-import Controller from "./core/lib/controller.js";
+
 
 import Service from "./core/lib/service.js";
 import cache from './core/lib/cache.js';
@@ -21,7 +21,7 @@ class Chan {
   static plugins = {};
   static config = config;
   static cache = cache;
-  static Controller = Controller;
+
  
   constructor() {
     this.app = express();
@@ -33,10 +33,14 @@ class Chan {
     await this.loadConfig();
     await this.loadExtends();
     this.loadCore();
-    this.loadKnex();
+    this.loadDB();
     this.loadCors();
   }
 
+  extend(name, fn) {
+    this.app.plus[name] = ()=>fn;
+  }
+
 
   async loadConfig() {
     const configPath = path.join(Chan.config.APP_PATH, "config/index.js");
@@ -68,7 +72,7 @@ class Chan {
   }
 
   //数据库操作
-  loadKnex() {
+  loadDB() {
     if(Chan.config?.db?.length > 0){
       Chan.config.db.map((item,index) => {
         if(index ==0){

package/package.json

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

package/core/lib/controller.js

@@ -1,68 +0,0 @@
-/**
- * @description
- * 控制器基类
- */
-class Controller {
-
-  status = {
-    200:"操作成功",
-    201:"操作失败",
-    //错误状态码
-    401:"未授权",
-    403:"禁止访问",
-    404:"找不到资源",
-    500:"服务器内部错误",
-    //业务状态码
-    1001:"参数错误",
-    1002:"用户名或密码错误",
-    1003:"用户名已存在",
-    1004:"邮箱已存在",
-    1005:"手机号已存在",
-    1006:"验证码错误",
-    1007:"验证码已过期",
-    1008:"验证码发送失败",
-    1009:"验证码发送成功",
-    1010:"用户未登录",
-    1011:"用户未注册",
-    1012:"用户已注册",
-    //资源验证码
-    1013:"上传文件超过限制",
-    1014:"操作不允许",
-    1015:"资源不存在",
-    //其他状态码
-    9999:"系统内部错误",
-    
- };
-
-  constructor() {
-   
-  }
-
-  // 获取状态
-  getStatus() {
-    return this.status
-  }
-
-  setTatus(key, val) {
-    this.status[key] = val
-  }
-
-  success(res,data = {}) {
-    res.json({
-      code: 200,
-      msg: this.status[200],
-      data
-    })
-  }
-
-  // 定义一个fail函数，用于返回错误信息
-  fail(res,code,data, msg='操作失败') {
-      res.json({
-        code: code,
-        msg: this.status[code] || msg,
-        data
-      })
-  }
-}
-
-export default Controller;