chanjs 1.0.20 → 1.0.22

package/core/chan.js

@@ -1,9 +1,13 @@
 const express = require("express");
 const config = require("./lib/config/config.js");
+const bindClass = require("./lib/extend/bindClass.js");
+const Controller = require("./lib/controller/controller.js")
+const Service = require("./lib/service/service.js")
 const path = require("path");
 const fs = require("fs");
 const core = require("./lib/core.js");
-const cors = require('cors')
+const cors = require('cors');
+
 /**
  * @description 基于express封装的mvc框架，遵循约定优于配置原则
  */
@@ -17,6 +21,10 @@ class Chan {
     Chan.plugins ={};
     //工具
     Chan.helper ={};
+
+    //控制器基类
+    Chan.Controller = Controller;
+    
     //应用实例
     this.app = express();
     this.app.config = Chan.config;
@@ -29,6 +37,7 @@ class Chan {
     this.loadCore();
     //加载实例化数据库
     this.loadKnex();
+
     //生命周期钩子：开始启动 
     this.beforeStart();
     //解决跨域
@@ -73,9 +82,9 @@ class Chan {
   //数据库操作
   loadKnex(){
     // 连接数据库
-    const {host,port,user,password,database,client,charset} = Chan.config.database;
+    const {host,port,user,password,database,client='mysql2',charset} = Chan.config.database;
     const knex = require("knex")({
-      client: "mysql2",
+      client: client,
       connection: {
         host,
         port,
@@ -99,7 +108,10 @@ class Chan {
         },
       },
     });
+    //数据库操作实例
     Chan.knex = knex;
+    //数据库操作基类
+    Chan.Service = Service(knex);
   }
 
   //开始启动
@@ -184,7 +196,7 @@ class Chan {
         const serviceName = file.replace(".js", "");
         //模块文件夹-模块文件名-服务-方法
         Chan[modules][moduleName].service[serviceName] = {};
-        Chan[modules][moduleName].service[serviceName] = Service;
+        Chan[modules][moduleName].service[serviceName] = bindClass(Service);
       }
     }
   }
@@ -206,7 +218,7 @@ class Chan {
         const controller = require(path.join(controllersDir, file));
         const controllerName = file.replace(".js", "");
         Chan[modules][moduleName].controller[controllerName] = {};
-        Chan[modules][moduleName].controller[controllerName] = controller;
+        Chan[modules][moduleName].controller[controllerName] = bindClass(controller);
       }
     }
   }

package/core/lib/controller/controller.js

@@ -0,0 +1,30 @@
+/**
+ * @description
+ * 控制器基类
+ */
+class Controller{
+
+    constructor(){
+        
+    }
+
+    download(res,file){
+        res.download(file)
+    }
+
+    success(res,data=null){
+        res.json({code:200,msg:'success',data:data})
+    }
+
+    fail(res,msg='操作失败，请稍后再试'){
+        res.json({code:400,msg:msg})
+    }
+
+    error(res,msg){
+        res.json({code:500,msg:msg})
+    }
+}
+
+
+
+module.exports = Controller;

package/core/lib/extend/bindClass.js

@@ -0,0 +1,23 @@
+/**
+ * @description 实例化一个类，并将该类的所有方法绑定到一个新的对象上。
+ * @param {Function} className - 需要实例化的类。
+ *@returns {Object} 包含绑定方法的对象。
+ */
+function bindClass(className) {
+    let obj = {};
+    const cls = new className();
+    Object.getOwnPropertyNames(cls.constructor.prototype).forEach(
+      (methodName) => {
+        if (
+          methodName !== "constructor" &&
+          typeof cls[methodName] === "function"
+        ) {
+          obj[methodName] = cls[methodName].bind(cls);
+        }
+      }
+    );
+    return obj;
+  }
+
+
+  module.exports = bindClass;

package/core/lib/service/service.js

@@ -0,0 +1,32 @@
+class BaseService {
+    constructor(knex, model='') {
+        this.knex = knex;
+        this.model = model;
+    }
+
+    all() {
+        return this.knex(this.model).select();
+    }
+
+    detail(id) {
+        return this.knex(this.model).where('id', id).select();
+    }
+
+    insert(params) {
+        return this.knex(this.model).insert(params);
+    }
+
+    update(id, params) {
+        return this.knex(this.model).where('id', id).update(params);
+    }
+
+    delete(id) {
+        return this.knex(this.model).where('id', id).del();
+    }
+}
+
+const Service = (knex, model='') => {
+    return new BaseService(knex, model);
+};
+
+module.exports = Service;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "chanjs",
-  "version": "1.0.20",
+  "version": "1.0.22",
   "description": "Chan.js基于express 纯js研发的轻量级mvc框架。",
   "main": "core/chan.js",
   "module": "core/chan.js",

package/core/lib/controller/Base.js

@@ -1,9 +0,0 @@
-class Base{
-    constructor(config){
-        this.config = config;
-    }
-
-    log(...args){
-        console.log(...args); 
-    }
-}

package/core/lib/extend/controller.js

@@ -1,217 +0,0 @@
-
-/**
- * extend controller
- */
-module.exports = {
-  /**
-   * body getter
-   */
-  get body() {
- 
-  },
-  /**
-   * body setter
-   */
-  set body(value) {
-
-  },
-  /**
-   * get client ip
-   */
-  get ip() {
-
-  },
-  /**
-   * get client ips
-   */
-  get ips() {
-
-  },
-  /**
-   * get status code
-   */
-  get status() {
-
-  },
-  /**
-   * set status code
-   */
-  set status(status) {
-
-  },
-  /**
-   * get content type
-   */
-  get type() {
-
-  },
-  /**
-   * set content type
-   */
-  set type(contentType) {
-
-  },
-  /**
-   * get userAgent header
-   */
-  get userAgent() {
-
-  },
-  /**
-   * get request method
-   */
-  get method() {
-
-  },
-  /**
-   * is get method
-   */
-  get isGet() {
-
-  },
-  /**
-   * is post method
-   */
-  get isPost() {
-
-  },
-  /**
-   * is command line invoke
-   */
-  get isCli() {
-
-  },
-  /**
-   * get or set config
-   * @param {String} name
-   * @param {Mix} value
-   * @param {String} m
-   */
-  config(name, value, m ) {
-
-  },
-  /**
-   * is method
-   * @param {String} method
-   */
-  isMethod(method) {
-
-  },
-  /**
-   * check if is ajax request
-   * @param {String} method
-   */
-  isAjax(method) {
-
-  },
-  /**
-   * is jsonp request
-   * @param {String} callback
-   */
-  isJsonp(callbackField) {
-
-  },
-  /**
-   * send jsonp data
-   */
-  jsonp(data, callbackField) {
-
-  },
-  /**
-   * send json data
-   */
-  json(data) {
-
-  },
-  /**
-   * send success data
-   */
-  success(data, message) {
-
-  },
-  /**
-   * send fail data
-   */
-  fail(errno, errmsg, data) {
-
-  },
-  /**
-   * set expires header
-   * @param {Number} time
-   */
-  expires(time) {
-
-  },
-  /**
-   * get query data
-   * @param {String} name
-   * @param {Mixed} value
-   */
-  get(name, value) {
-
-  },
-  /**
-   * get query data
-   * @param {String} name
-   * @param {Mixed} value
-   */
-  query(name, value) {
-
-  },
-  /**
-   * get or set post data
-   * @param {String} name
-   * @param {Mixed} value
-   */
-  post(name, value) {
-
-  },
-  /**
-   * get or set file data
-   * @param {String} name
-   * @param {Mixed} value
-   */
-  file(name, value) {
-
-  },
-  /**
-   * get or set cookies
-   * @param {String} name
-   * @param {String} value
-   * @param {Object} options
-   */
-  cookie(name, value, options) {
-
-  },
-  
-  /**
-   * get referer header
-   */
-  referrer(onlyHost) {
-   
-  },
-  /**
-   * get referer header
-   */
-  referer(onlyHost) {
-
-  },
-  /**
-   * Perform a 302 redirect to `url`.
-   * @param {String} url
-   * @param {String} alt
-   */
-  redirect(url, alt) {
-  
-  },
- 
-  
-  /**
-   * download
-   * @param {String} filepath
-   * @param {String} filename
-   */
-  download(filepath, filename) {
-   
-  }
-};