chanjs 1.0.38 → 1.0.39

package/README.md

@@ -3,7 +3,7 @@
 
 Chanjs 是一个基于 Express 构建的轻量级 MVC 框架，完全使用 JavaScript 开发。它体现了函数式编程的概念，提供了卓越的性能、清晰的代码和易于遵循的过程，确保了高可维护性。
 
-## features
+## 特点
 
 - 基于 Express 构建
 - 支持 ES6 语法
@@ -65,7 +65,7 @@ Chanjs 是一个基于 Express 构建的轻量级 MVC 框架，完全使用 Java
 - `beforeStart()` 钩子用于将数据库中的配置合并到配置中
 - `run()` 启动服务器
 
-### ### 官方网站
+### 官方网站
 
 使用 Chanjs 开发的 CMS 系统  
 网站：[https://www.chancms.top](https://www.chancms.top)
@@ -76,7 +76,7 @@ Chanjs 是一个基于 Express 构建的轻量级 MVC 框架，完全使用 Java
 - 多模块 MVC 结构
 - 插件 MVC 支持
 - CORS 跨域配置支持
-- MySQL 数据库支持
+- 多数据库支持 （PostgreSQL、MySQL / MariaDB、SQLite3、Oracle Database、MSSQL）
 - 路由控制
 - Art-template 模板引擎
 - 静态资源管理

package/core/{lib/extend/helper.js → helper.js}

@@ -5,7 +5,7 @@ const knex = require('knex');
  * @param {Function} className - 需要实例化的类。
  *@returns {Object} 包含绑定方法的对象。
  */
-function bindClass(className) {
+exports.bindClass = function(className) {
   let obj = {};
   const cls = new className();
   Object.getOwnPropertyNames(cls.constructor.prototype).forEach(
@@ -22,7 +22,7 @@ function bindClass(className) {
 }
 
 
- function createKnex(opt) {
+exports.createKnex = function(opt) {
     let config = {
         host:"localhost",
         port:"3306",
@@ -63,7 +63,7 @@ function bindClass(className) {
  * @returns Array 
  * @description 将web模块放到最后加载
  */
-function loadWebToEnd(module=[]){
+exports.loadWebToEnd = function(module=[]){
   const index = module.indexOf('web');
   if (index !== -1) {
       const web = module.splice(index, 1);
@@ -71,8 +71,3 @@ function loadWebToEnd(module=[]){
   }
   return module;
 }
-module.exports = {
-    bindClass,
-    createKnex,
-    loadWebToEnd
-};

package/core/lib/controller.js

@@ -0,0 +1,68 @@
+/**
+ * @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
+      })
+  }
+}
+
+module.exports = Controller;

package/core/lib/index.js

@@ -3,7 +3,7 @@ const cookieParser = require("cookie-parser");
 const favicon = require("serve-favicon");
 const morgan = require("morgan");
 const path = require("path");
-const template = require("./middleware/template.js");
+const view = require("./view.js");
 module.exports = async function (app, config) {
   const { logger, APP_PATH, cookieKey, static, JSON_LIMIT, appName, version } =
     config;
@@ -13,7 +13,7 @@ module.exports = async function (app, config) {
   app.use(cookieParser(cookieKey));
   app.use(express.json({ limit: JSON_LIMIT }));
   app.use(express.urlencoded({ extended: false }));
-  template(app, config);
+  view(app, config);
   if (static.length > 0) {
     static.forEach((item) => {
       const { prefix, dir, maxAge } = item;

package/core/lib/{service/service.js → service.js}

@@ -2,11 +2,10 @@ class BaseService {
   /**
    * @description 构造函数
    * @param {*} knex - knex实例
-   * @param {*} model - 模型名称
    */
-  constructor(knex, model = "") {
-    this.knex = knex;
-    this.model = model;
+  constructor() {
+    this.knex = Chan.knex || null;
+    this.model = ''; // 默认为空字符串
   }
 
   /**

package/{core/chan.js → index.js}

@@ -2,12 +2,12 @@ const express = require("express");
 const path = require("path");
 const fs = require("fs");
 const cors = require("cors");
-const config = require("./lib/config/config.js");
-const {bindClass,createKnex,loadWebToEnd} = require("./lib/extend/helper.js");
-const Controller = require("./lib/controller/controller.js");
-const Service = require("./lib/service/service.js");
-const cache = require('./lib/extend/cache.js');
-const core = require("./lib/index.js");
+const config = require("./core/config.js");
+const {bindClass,createKnex,loadWebToEnd} = require("./core/helper.js");
+const Controller = require("./core/lib/controller.js");
+const Service = require("./core/lib/service.js");
+const cache = require('./core/lib/cache.js');
+const core = require("./core/lib/index.js");
 /**
  * @description 基于express封装的mvc框架，遵循约定优于配置原则
  */
@@ -18,7 +18,7 @@ class Chan {
   static config = config;
   static cache = cache;
   static Controller = Controller;
-  static Service = Service;
+ 
   constructor() {
     this.init();
   }
@@ -73,6 +73,7 @@ class Chan {
           Chan[`knex${index}`] = createKnex(item);
         }
       })
+      Chan.Service = Service;
     }
   }
 

package/package.json

@@ -1,32 +1,29 @@
 {
   "name": "chanjs",
-  "version": "1.0.38",
+  "version": "1.0.39",
   "description": "chanjs基于express 纯js研发的轻量级mvc框架。",
   "main": "core/chan.js",
   "module": "core/chan.js",
   "keywords": [
-    "\"chanjs\"",
-    "\"express mvc\"",
-    "\"express mysql\"",
-    "\"express knex\"",
-    "\"chancms\"",
-    "\"nodejs\""
+    "chanjs",
+    "express mvc",
+    "express mysql",
+    "express knex",
+    "chancms",
+    "nodejs"
   ],
-  "author": "\"明空\"",
+  "author": "明空",
   "license": "ISC",
   "dependencies": {
-    "art-template": "^4.13.2",
-    "body-parser": "^1.20.2",
-    "cookie-parser": "^1.4.6",
-    "cors": "^2.8.5",
-    "express": "^4.19.2",
-    "express-art-template": "^1.0.1",
-    "knex": "^3.1.0",
-    "morgan": "^1.10.0",
-    "mysql2": "^3.11.0",
-    "dayjs": "^1.11.12"
-  },
-  "__npminstall_done": true,
-  "_from": "chanjs@1.0.22",
-  "_resolved": "https://registry.npmmirror.com/chanjs/-/chanjs-1.0.22.tgz"
-}
+    "art-template": "4.13.2",
+    "body-parser": "1.20.2",
+    "cookie-parser": "1.4.6",
+    "cors": "2.8.5",
+    "express": "4.19.2",
+    "express-art-template": "1.0.1",
+    "knex": "3.1.0",
+    "morgan": "1.10.0",
+    "mysql2": "3.11.0",
+    "dayjs": "1.11.12"
+  }
+}

package/core/lib/controller/controller.js

@@ -1,25 +0,0 @@
-/**
- * @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;