chanjs 1.0.12 → 1.0.14

package/core/chan.js

@@ -3,7 +3,7 @@ const config = require("./lib/config/config.js");
 const path = require("path");
 const fs = require("fs");
 const core = require("./lib/core.js");
-
+const cors = require('cors')
 /**
  * @description 基于express封装的mvc框架，遵循约定优于配置原则
  */
@@ -31,6 +31,8 @@ class Chan {
     this.loadKnex();
     //生命周期钩子：开始启动 
     this.beforeStart();
+    //解决跨域
+    this.loadCors();
     //加载模块
     this.loadModules();
     //加载插件
@@ -100,7 +102,6 @@ class Chan {
     Chan.knex = knex;
   }
 
-
   //开始启动
   beforeStart(cb) {
     // 初始化一些配置
@@ -113,6 +114,11 @@ class Chan {
     cb && cb();
   }
 
+  //解决跨域
+  loadCors(){
+    Chan.config?.cors?.origin && this.app.use(cors());
+  }
+
   // 加载插件
   loadPlugins() {
     this.loadModules('plugins');
@@ -144,8 +150,6 @@ class Chan {
           };
           this.loadModule(modules,item);
         }
-
-     
       //执行路由
       // this.app.use(this.router);
     }
@@ -170,7 +174,6 @@ class Chan {
    */
   loadServices(modules,moduleName) {
     const servicesDir = path.join(config.APP_PATH, modules, moduleName,"service");
-
     if (fs.existsSync(servicesDir)) {
       let services = fs
         .readdirSync(servicesDir)
@@ -227,15 +230,12 @@ class Chan {
       const baseRouterPath = path.join(config.APP_PATH, "router.js");
       if (fs.existsSync(baseRouterPath)) {
         const _router = require(baseRouterPath);
-        console.log('_router-->',_router);
         _router(this.app, this.router);
       } 
     } catch (error) {
       console.log(error);
     }
-    
   }
-
   
   run() {
     const port = this.app.config.port || '81';

package/core/lib/config/config.js

@@ -28,6 +28,9 @@ let config = {
     password: "123456",
     database: "chanyue",
     charset: "utf8mb4",
+  },
+  cors:{
+    origin: '*'
   }
 }
 

package/package.json

@@ -1,14 +1,14 @@
 {
   "name": "chanjs",
-  "version": "1.0.12",
+  "version": "1.0.14",
   "description": "Chanjs develops a lightweight MVC framework based on express pure JavaScript",
   "main": "core/chan.js",
-  "module":"core/chan.js",
+  "module": "core/chan.js",
   "keywords": [
     "\"chanjs\"",
-	"\"express mvc\"",
-	"\"chancms\"",
-	"\"nodejs\""
+    "\"express mvc\"",
+    "\"chancms\"",
+    "\"nodejs\""
   ],
   "author": "\"明空\"",
   "license": "ISC",
@@ -16,10 +16,11 @@
     "art-template": "^4.13.2",
     "body-parser": "^1.20.2",
     "cookie-parser": "^1.4.6",
-    "express": "^4.18.2",
+    "cors": "^2.8.5",
+    "express": "^4.19.2",
     "express-art-template": "^1.0.1",
-    "knex": "^3.0.1",
+    "knex": "^3.1.0",
     "morgan": "^1.10.0",
-    "mysql2": "^3.6.2"
+    "mysql2": "^3.11.0"
   }
-}
+}