From 82be8b94b4bc21a66fd705474ac4c393bdb73fbd Mon Sep 17 00:00:00 2001 From: wlz321 <2505013465@qq.com> Date: Wed, 17 Jun 2020 23:05:58 +0800 Subject: [PATCH 1/2] restart env --- .gitignore | 4 +- .vs/VSWorkspaceState.json | 7 ++ .vs/slnx.sqlite | Bin 0 -> 90112 bytes .vs/web-node/v16/.suo | Bin 0 -> 18944 bytes LICENSE | 42 ++++---- README.md | 42 ++++---- assets/js/websocket.js | 74 +++++++------- biz/UserBiz.js | 12 +-- config/params.mongodb.js | 12 +-- config/params.mysql.js | 12 +-- config/params.redis.js | 8 +- controller/api.js | 28 +++--- controller/cookie.js | 18 ++-- controller/index.js | 48 ++++----- controller/needle.js | 22 ++--- controller/user.js | 198 +++++++++++++++++++------------------- db/DBManager.js | 54 +++++------ db/mongodb/client.js | 78 +++++++-------- db/mysql/client.js | 176 ++++++++++++++++----------------- db/redis/client.js | 66 ++++++------- framework/controller.js | 48 ++++----- framework/model.js | 114 +++++++++++----------- framework/rest.js | 58 +++++------ framework/view.js | 78 +++++++-------- model/Pet.js | 26 ++--- model/User.js | 24 ++--- pm2.json | 76 +++++++-------- pm2.json.default | 76 +++++++-------- view/base.html | 18 ++-- view/index.html | 86 ++++++++--------- view/wechat.html | 44 ++++----- ws.js | 72 +++++++------- wss.js | 78 +++++++-------- 33 files changed, 853 insertions(+), 846 deletions(-) create mode 100644 .vs/VSWorkspaceState.json create mode 100644 .vs/slnx.sqlite create mode 100644 .vs/web-node/v16/.suo diff --git a/.gitignore b/.gitignore index 8aa9de1..eedf527 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,3 @@ -/logs/ -/node_modules/ +/logs/ +/node_modules/ /test/ \ No newline at end of file diff --git a/.vs/VSWorkspaceState.json b/.vs/VSWorkspaceState.json new file mode 100644 index 0000000..5ddea5d --- /dev/null +++ b/.vs/VSWorkspaceState.json @@ -0,0 +1,7 @@ +{ + "ExpandedNodes": [ + "" + ], + "SelectedNode": "\\.gitignore", + "PreviewInSolutionExplorer": false +} \ No newline at end of file diff --git a/.vs/slnx.sqlite b/.vs/slnx.sqlite new file mode 100644 index 0000000000000000000000000000000000000000..d147d27ab92587f72f1bf406f907b3ea03373b54 GIT binary patch literal 90112 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 m{#|YLq { - websocket.send('_SYN_'+new Date().getTime()); - }, 40000); -} -function onClose(evt) { - console.log("Disconnected"); - clearInterval(websocket.HeartBeat); - websocket.HeartBeat = undefined; -} -function onError(evt) { - console.log('Error occured: ' , evt); - clearInterval(websocket.HeartBeat); - websocket.HeartBeat = undefined; - setTimeout(() => { - websocket = createWebSocket();//重新连接 - }, 6000); -} - -function onMessage(evt) { - console.log('Retrieved data from server: ' , evt.data); -} +var host = location.host;//本地域名 +var port = 32772;//与docker 容器中web端口对应的本地端口 +var wsServer = 'ws://'+host+':'+port+'/wechat'; +var websocket = createWebSocket(); + +function createWebSocket(){ + var websocket = new WebSocket(wsServer); + websocket.onopen = function (evt) { onOpen(evt) }; + websocket.onclose = function (evt) { onClose(evt) }; + websocket.onmessage = function (evt) { onMessage(evt) }; + websocket.onerror = function (evt) { onError(evt) }; + return websocket; +} +function onOpen(evt) { + websocket.send('_SYN_'+new Date().getTime()); + console.log("Connected to ",websocket.url); + websocket.HeartBeat = setInterval(() => { + websocket.send('_SYN_'+new Date().getTime()); + }, 40000); +} +function onClose(evt) { + console.log("Disconnected"); + clearInterval(websocket.HeartBeat); + websocket.HeartBeat = undefined; +} +function onError(evt) { + console.log('Error occured: ' , evt); + clearInterval(websocket.HeartBeat); + websocket.HeartBeat = undefined; + setTimeout(() => { + websocket = createWebSocket();//重新连接 + }, 6000); +} + +function onMessage(evt) { + console.log('Retrieved data from server: ' , evt.data); +} diff --git a/biz/UserBiz.js b/biz/UserBiz.js index 442e5cb..8d71347 100644 --- a/biz/UserBiz.js +++ b/biz/UserBiz.js @@ -1,7 +1,7 @@ -class UserBiz{ - static a(){ - - } -} - +class UserBiz{ + static a(){ + + } +} + module.exports = UserBiz; \ No newline at end of file diff --git a/config/params.mongodb.js b/config/params.mongodb.js index e450f90..06b3bcc 100644 --- a/config/params.mongodb.js +++ b/config/params.mongodb.js @@ -1,7 +1,7 @@ -module.exports = { - host: '127.0.0.1', - port:27017, - username:'root', - password:'mnbvcxz_123', - db:'node' +module.exports = { + host: '127.0.0.1', + port:27017, + username:'root', + password:'mnbvcxz_123', + db:'node' } \ No newline at end of file diff --git a/config/params.mysql.js b/config/params.mysql.js index 5fe4302..8856e0a 100644 --- a/config/params.mysql.js +++ b/config/params.mysql.js @@ -1,7 +1,7 @@ -module.exports = { - host:'172.17.0.3', - port:'3306', - username:'root', - password:'mnbvcxz@123', - database:'test' +module.exports = { + host:'172.17.0.2', + port:'3306', + username:'root', + password:'mnbvcxz@123', + database:'test' } \ No newline at end of file diff --git a/config/params.redis.js b/config/params.redis.js index 3fa7094..f06614b 100644 --- a/config/params.redis.js +++ b/config/params.redis.js @@ -1,5 +1,5 @@ -module.exports = { - host:'172.17.0.4', - port: 6379, - auth_pass:'mnbvcxz_123' +module.exports = { + host:'172.17.0.4', + port: 6379, + auth_pass:'mnbvcxz_123' } \ No newline at end of file diff --git a/controller/api.js b/controller/api.js index 170139b..4073845 100644 --- a/controller/api.js +++ b/controller/api.js @@ -1,15 +1,15 @@ - -module.exports = { - "GET /api/test":async (ctx, next) => { - ctx.rest({name:'wlz','test':true,'api':'test'}); - }, - "GET /api/test1":async (ctx, next) => { - ctx.rest({name:'wlz','test':true,'api':'test1'}); - }, - "GET /api/test2":async (ctx, next) => { - ctx.rest({name:'wlz','test':true,'api':'test2'}); - }, - "GET /api/testerr":async (ctx, next) => { - ctx.restError('test:testerr','测试错误接口1'); - } + +module.exports = { + "GET /api/test":async (ctx, next) => { + ctx.rest({name:'wlz','test':true,'api':'test'}); + }, + "GET /api/test1":async (ctx, next) => { + ctx.rest({name:'wlz','test':true,'api':'test1'}); + }, + "GET /api/test2":async (ctx, next) => { + ctx.rest({name:'wlz','test':true,'api':'test2'}); + }, + "GET /api/testerr":async (ctx, next) => { + ctx.restError('test:testerr','测试错误接口1'); + } } \ No newline at end of file diff --git a/controller/cookie.js b/controller/cookie.js index ea7ae05..eea429e 100644 --- a/controller/cookie.js +++ b/controller/cookie.js @@ -1,10 +1,10 @@ - - -module.exports = { - "GET /testcookie":async (ctx, next) => { - ctx.set('Set-Cookie', 'foo=bar; Path=/; HttpOnly;maxAge:0'); - ctx.cookies.set('name', 'tobi', { signed: true }); - ctx.response.body = 'ok'; - await next(); - } + + +module.exports = { + "GET /testcookie":async (ctx, next) => { + ctx.set('Set-Cookie', 'foo=bar; Path=/; HttpOnly;maxAge:0'); + ctx.cookies.set('name', 'tobi', { signed: true }); + ctx.response.body = 'ok'; + await next(); + } } \ No newline at end of file diff --git a/controller/index.js b/controller/index.js index 72a5977..41ab655 100644 --- a/controller/index.js +++ b/controller/index.js @@ -1,25 +1,25 @@ -const {Op} = require('sequelize'); -const path = require('path'); - -module.exports = { - "GET /":async ( ctx, next )=>{ - try{ - ctx.state.where = { - 'is':'adc' - } - await ctx.render('index.html',{test:{time:new Date().getTime()}}); - }catch(e){ - ctx.response.body = e.message; - } - await next(); - }, - "GET /wechat":async ( ctx, next )=>{ - try{ - await ctx.render('wechat.html',{}); - }catch(e){ - ctx.response.body = e.message; - } - await next(); - } - +const {Op} = require('sequelize'); +const path = require('path'); + +module.exports = { + "GET /":async ( ctx, next )=>{ + try{ + ctx.state.where = { + 'is':'adc' + } + await ctx.render('index.html',{test:{time:new Date().getTime()}}); + }catch(e){ + ctx.response.body = e.message; + } + await next(); + }, + "GET /wechat":async ( ctx, next )=>{ + try{ + await ctx.render('wechat.html',{}); + }catch(e){ + ctx.response.body = e.message; + } + await next(); + } + } \ No newline at end of file diff --git a/controller/needle.js b/controller/needle.js index 26c20a0..cf8be05 100644 --- a/controller/needle.js +++ b/controller/needle.js @@ -1,12 +1,12 @@ -const Needle = require('needle'); -module.exports = { - "GET /sinaimg":async ( ctx, next )=>{ - await Needle('get','https://wx4.sinaimg.cn/large/60718250ly1gflpmgpk77j20bv0bvjrp.jpg').then((res)=>{ - ctx.response.type = 'image/jpg'; - ctx.response.body = res.body; - }).catch((err)=>{ - ctx.response.type = 'ico'; - ctx.response.body = fs.createReadStream('./favicon.ico'); - }) - } +const Needle = require('needle'); +module.exports = { + "GET /sinaimg":async ( ctx, next )=>{ + await Needle('get','https://wx4.sinaimg.cn/large/60718250ly1gflpmgpk77j20bv0bvjrp.jpg').then((res)=>{ + ctx.response.type = 'image/jpg'; + ctx.response.body = res.body; + }).catch((err)=>{ + ctx.response.type = 'ico'; + ctx.response.body = fs.createReadStream('./favicon.ico'); + }) + } } \ No newline at end of file diff --git a/controller/user.js b/controller/user.js index 7241889..aa58f6c 100644 --- a/controller/user.js +++ b/controller/user.js @@ -1,100 +1,100 @@ - -/** - * todo fix me - * 注册登录页面应该具有独立的页面，不至于未登录状态和登录状态的逻辑处理重叠，比如首页会增加ctx.state.User - */ -const createError = require('http-errors'); -module.exports = { - "POST /signup": async (ctx, next)=>{ - const body = ctx.request.body; - let email = body.email.trim(); - let password = body.password.trim(); - let timestamp = new Date().getTime(); - - if(!email || !password){ - throw createError(400, 'params less'); - } - await ModelUser.findOne({ where: {email: email} }).then(user => { - if(user){ - console.log('findOne user',user.get({ - plain: true - })) - throw createError(400, '邮箱已存在'); - } - }).then(()=>{ - return ModelUser.create({ - namenick: 'User'+timestamp, - email: email, - password:password, - gender: 1, - birth: '10-01' - }).then(user => { - let user_plain = user.get({ - plain: true - }); - session.user_id = user_plain.id; - DB_Redis.getClient().set(session.id, JSON.stringify(session)); - DB_Redis.getClient().expire(session.id, 20 * 60 ); - ctx.redirect('/'); - }).catch((err)=>{ - throw createError(500,'注册失败'); - }) - }) - }, - - "POST /signin": async (ctx, next)=>{ - const body = ctx.request.body; - let email = body.email.trim(); - let password = body.password.trim(); - - await ModelUser.findOne({ where: {email: email, password: password} }).then(user => { - if(user){ - let user_plain = user.get({ - plain: true - }); - session.user_id = user_plain.id; - DB_Redis.getClient().set(session.id, JSON.stringify(session)); - DB_Redis.getClient().expire(session.id, 20 * 60 ); - ctx.redirect('/'); - }else{ - throw createError(400, '用户不存在或密码错误'); - } - }); - await next(); - }, - - "GET /signout": async (ctx, next)=>{ - if(!session.user_id){ - throw createError(400, '错误请求'); - } - await ModelUser.findByPk(parseInt(session.user_id)).then(user => { - if(user){ - let user_plain = user.get({plain: true}); - DB_Redis.getClient().expire(session.id, 0 ); - ctx.cookies.set(session_name, '', { signed: true , expires :0 }); - session = null; - ctx.state.User = null; - ctx.redirect('/'); - }else{ - throw createError(400, '用户不存在或密码错误'); - } - }); - await next(); - }, - - - "POST /consultSubmit": async (ctx, next)=>{ - const request = ctx.request; - - console.log('body', request.body ) - console.log('files',request.files) - - const body = request.body || {}; - - // if (!body.age) ctx.throw(400, '.age required'); - - ctx.body = { age: body.age || '---' }; - - await next(); - } + +/** + * todo fix me + * 注册登录页面应该具有独立的页面，不至于未登录状态和登录状态的逻辑处理重叠，比如首页会增加ctx.state.User + */ +const createError = require('http-errors'); +module.exports = { + "POST /signup": async (ctx, next)=>{ + const body = ctx.request.body; + let email = body.email.trim(); + let password = body.password.trim(); + let timestamp = new Date().getTime(); + + if(!email || !password){ + throw createError(400, 'params less'); + } + await ModelUser.findOne({ where: {email: email} }).then(user => { + if(user){ + console.log('findOne user',user.get({ + plain: true + })) + throw createError(400, '邮箱已存在'); + } + }).then(()=>{ + return ModelUser.create({ + namenick: 'User'+timestamp, + email: email, + password:password, + gender: 1, + birth: '10-01' + }).then(user => { + let user_plain = user.get({ + plain: true + }); + session.user_id = user_plain.id; + DB_Redis.getClient().set(session.id, JSON.stringify(session)); + DB_Redis.getClient().expire(session.id, 20 * 60 ); + ctx.redirect('/'); + }).catch((err)=>{ + throw createError(500,'注册失败'); + }) + }) + }, + + "POST /signin": async (ctx, next)=>{ + const body = ctx.request.body; + let email = body.email.trim(); + let password = body.password.trim(); + + await ModelUser.findOne({ where: {email: email, password: password} }).then(user => { + if(user){ + let user_plain = user.get({ + plain: true + }); + session.user_id = user_plain.id; + DB_Redis.getClient().set(session.id, JSON.stringify(session)); + DB_Redis.getClient().expire(session.id, 20 * 60 ); + ctx.redirect('/'); + }else{ + throw createError(400, '用户不存在或密码错误'); + } + }); + await next(); + }, + + "GET /signout": async (ctx, next)=>{ + if(!session.user_id){ + throw createError(400, '错误请求'); + } + await ModelUser.findByPk(parseInt(session.user_id)).then(user => { + if(user){ + let user_plain = user.get({plain: true}); + DB_Redis.getClient().expire(session.id, 0 ); + ctx.cookies.set(session_name, '', { signed: true , expires :0 }); + session = null; + ctx.state.User = null; + ctx.redirect('/'); + }else{ + throw createError(400, '用户不存在或密码错误'); + } + }); + await next(); + }, + + + "POST /consultSubmit": async (ctx, next)=>{ + const request = ctx.request; + + console.log('body', request.body ) + console.log('files',request.files) + + const body = request.body || {}; + + // if (!body.age) ctx.throw(400, '.age required'); + + ctx.body = { age: body.age || '---' }; + + await next(); + } } \ No newline at end of file diff --git a/db/DBManager.js b/db/DBManager.js index 81ea495..7657271 100644 --- a/db/DBManager.js +++ b/db/DBManager.js @@ -1,28 +1,28 @@ -/** - * 根据不同的驱动连接不同的客户端 - */ - -class DBConnection{ - constructor(){ - this.client = null; - } - static createDriver(name){ - if(Array.isArray(name)){ - - }else{ - - } - - } - createClient(){ - - } - quitClient(){ - - } - getClient(){ - - } -} - +/** + * 根据不同的驱动连接不同的客户端 + */ + +class DBConnection{ + constructor(){ + this.client = null; + } + static createDriver(name){ + if(Array.isArray(name)){ + + }else{ + + } + + } + createClient(){ + + } + quitClient(){ + + } + getClient(){ + + } +} + module.exports = DBConnection; \ No newline at end of file diff --git a/db/mongodb/client.js b/db/mongodb/client.js index ed5a435..5420982 100644 --- a/db/mongodb/client.js +++ b/db/mongodb/client.js @@ -1,40 +1,40 @@ - - -//固定mongodb数据库 -const path = require('path'); -const mongoose = require('mongoose'); -mongoose.Promise = global.Promise; - -const config = require(path.join(BasePath,'config','params.mongodb.js')); - -class Mongodb{ - constructor(){ - this.client = null; - } - createClient(){ - return new Promise((resolve, reject)=>{ - let uri = 'mongodb://'+config.username+':'+config.password+'@'+config.host+':'+config.port+'/'+config.db+'?authSource=node' ; - let tt = mongoose.connect(uri, {useNewUrlParser: true, useUnifiedTopology: true}); - this.client = mongoose.connection; - this.client.setMaxListeners(0); - this.client.on('connected',(a)=>{ - resolve(); - }); - this.client.on('error',(err)=>{ - reject(err); - }); - }) - } - quitClient(){ - if(this.client){ - this.client.close((err)=>{ - this.client = null; - }); - } - } - getClient(){ - return this.client; - } -} - + + +//固定mongodb数据库 +const path = require('path'); +const mongoose = require('mongoose'); +mongoose.Promise = global.Promise; + +const config = require(path.join(BasePath,'config','params.mongodb.js')); + +class Mongodb{ + constructor(){ + this.client = null; + } + createClient(){ + return new Promise((resolve, reject)=>{ + let uri = 'mongodb://'+config.username+':'+config.password+'@'+config.host+':'+config.port+'/'+config.db+'?authSource=node' ; + let tt = mongoose.connect(uri, {useNewUrlParser: true, useUnifiedTopology: true}); + this.client = mongoose.connection; + this.client.setMaxListeners(0); + this.client.on('connected',(a)=>{ + resolve(); + }); + this.client.on('error',(err)=>{ + reject(err); + }); + }) + } + quitClient(){ + if(this.client){ + this.client.close((err)=>{ + this.client = null; + }); + } + } + getClient(){ + return this.client; + } +} + module.exports = Mongodb; \ No newline at end of file diff --git a/db/mysql/client.js b/db/mysql/client.js index a8d438c..295bd0a 100644 --- a/db/mysql/client.js +++ b/db/mysql/client.js @@ -1,89 +1,89 @@ - - -//固定mongodb数据库 -const path = require('path'); -const Sequelize = require('sequelize'); -const config = require(path.join(BasePath,'config','params.mysql.js')); - -class Mysql{ - constructor(){ - this.client = null; - } - createClient(){ - this.client = new Sequelize(config.database, config.username, config.password, { - host: config.host, - port: config.port, - dialect: 'mysql', - pool: { - max: 10, - min: 0, - acquire: 30000, - idle: 10000 - } - }); - return this.client.authenticate(); - } - quitClient(){ - if(this.client){ - this.client.close().then(()=>{ - this.client = null; - }) - } - } - getClient(){ - return this.client; - } - - defineSQLModel(name, attributes) { - let attrs = {}; - for (let key in attributes) { - let value = attributes[key]; - if (typeof value === 'object' && value['type']) { - value.allowNull = value.allowNull || false; - attrs[key] = value; - } else { - attrs[key] = { - type: value, - allowNull: false - }; - } - } - attrs.id = { - type: Sequelize.INTEGER(11), - primaryKey: true, - autoIncrement:true - }; - attrs.createdAt = { - type: Sequelize.BIGINT, - allowNull: false - }; - attrs.updatedAt = { - type: Sequelize.BIGINT, - allowNull: false - }; - attrs.version = { - type: Sequelize.BIGINT, - allowNull: false - }; - return this.client.define(name, attrs, { - tableName: name, - timestamps: false, - hooks: { - beforeValidate: function (obj) { - let now = Date.now(); - if (obj.isNewRecord) { - obj.createdAt = now; - obj.updatedAt = now; - obj.version = 0; - } else { - obj.updatedAt = now; - obj.version++; - } - } - } - }); - } - -} - + + +//固定mongodb数据库 +const path = require('path'); +const Sequelize = require('sequelize'); +const config = require(path.join(BasePath,'config','params.mysql.js')); + +class Mysql{ + constructor(){ + this.client = null; + } + createClient(){ + this.client = new Sequelize(config.database, config.username, config.password, { + host: config.host, + port: config.port, + dialect: 'mysql', + pool: { + max: 10, + min: 0, + acquire: 30000, + idle: 10000 + } + }); + return this.client.authenticate(); + } + quitClient(){ + if(this.client){ + this.client.close().then(()=>{ + this.client = null; + }) + } + } + getClient(){ + return this.client; + } + + defineSQLModel(name, attributes) { + let attrs = {}; + for (let key in attributes) { + let value = attributes[key]; + if (typeof value === 'object' && value['type']) { + value.allowNull = value.allowNull || false; + attrs[key] = value; + } else { + attrs[key] = { + type: value, + allowNull: false + }; + } + } + attrs.id = { + type: Sequelize.INTEGER(11), + primaryKey: true, + autoIncrement:true + }; + attrs.createdAt = { + type: Sequelize.BIGINT, + allowNull: false + }; + attrs.updatedAt = { + type: Sequelize.BIGINT, + allowNull: false + }; + attrs.version = { + type: Sequelize.BIGINT, + allowNull: false + }; + return this.client.define(name, attrs, { + tableName: name, + timestamps: false, + hooks: { + beforeValidate: function (obj) { + let now = Date.now(); + if (obj.isNewRecord) { + obj.createdAt = now; + obj.updatedAt = now; + obj.version = 0; + } else { + obj.updatedAt = now; + obj.version++; + } + } + } + }); + } + +} + module.exports = Mysql; \ No newline at end of file diff --git a/db/redis/client.js b/db/redis/client.js index 1a55a69..7a32a5d 100644 --- a/db/redis/client.js +++ b/db/redis/client.js @@ -1,34 +1,34 @@ - -//测试和高并发( ab -c 1000 -n 10000 http://127.0.0.1:9000/) - -const path = require('path'); -const redis = require('redis'); -const params = require(path.join(BasePath,'config','params.redis.js')); -const config = Object.assign({}, params, { detect_buffers: true }, {}); - -class Redis{ - constructor(){ - this.client = null; - } - createClient(){ - return new Promise((resolve, reject)=>{ - this.client = redis.createClient(config); - this.client.setMaxListeners(0); - this.client.on('connect',()=>{ - resolve(); - }); - this.client.on('error',(err)=>{ - reject(err); - }); - }) - } - quitClient(){ - if(this.client){ - this.client.quit(); - } - } - getClient(){ - return this.client; - } -} + +//测试和高并发( ab -c 1000 -n 10000 http://127.0.0.1:9000/) + +const path = require('path'); +const redis = require('redis'); +const params = require(path.join(BasePath,'config','params.redis.js')); +const config = Object.assign({}, params, { detect_buffers: true }, {}); + +class Redis{ + constructor(){ + this.client = null; + } + createClient(){ + return new Promise((resolve, reject)=>{ + this.client = redis.createClient(config); + this.client.setMaxListeners(0); + this.client.on('connect',()=>{ + resolve(); + }); + this.client.on('error',(err)=>{ + reject(err); + }); + }) + } + quitClient(){ + if(this.client){ + this.client.quit(); + } + } + getClient(){ + return this.client; + } +} module.exports = Redis; \ No newline at end of file diff --git a/framework/controller.js b/framework/controller.js index 5fccd29..557ed83 100644 --- a/framework/controller.js +++ b/framework/controller.js @@ -1,25 +1,25 @@ - -const fs = require('fs'); -const path = require('path'); -const createError = require('http-errors'); - -module.exports = function (controller) { - let router = require('koa-router')(); - fs.readdirSync(path.join(BasePath , 'controller')).filter((f) => { - return f.endsWith('.js'); - }).map((v,i)=>{ - let mapping = require(path.join(BasePath , 'controller', v) ); - for (let url in mapping) { - if (url.startsWith('GET ')) { - let pathname = url.substring(4); - router.get(pathname, mapping[url]); - } else if (url.startsWith('POST ')) { - let pathname = url.substring(5); - router.post(pathname, mapping[url]); - } else { - throw createError(500, `invalid URL: ${url}`); - } - } - }) - return router.routes(); + +const fs = require('fs'); +const path = require('path'); +const createError = require('http-errors'); + +module.exports = function (controller) { + let router = require('koa-router')(); + fs.readdirSync(path.join(BasePath , 'controller')).filter((f) => { + return f.endsWith('.js'); + }).map((v,i)=>{ + let mapping = require(path.join(BasePath , 'controller', v) ); + for (let url in mapping) { + if (url.startsWith('GET ')) { + let pathname = url.substring(4); + router.get(pathname, mapping[url]); + } else if (url.startsWith('POST ')) { + let pathname = url.substring(5); + router.post(pathname, mapping[url]); + } else { + throw createError(500, `invalid URL: ${url}`); + } + } + }) + return router.routes(); } \ No newline at end of file diff --git a/framework/model.js b/framework/model.js index 3aa0e52..1093dd9 100644 --- a/framework/model.js +++ b/framework/model.js @@ -1,58 +1,58 @@ - -const fs = require('fs'); -const path = require('path'); -const createError = require('http-errors'); - -const DBMysql = require(path.join(BasePath, 'db', 'mysql', 'client.js')); -const DBMongo = require(path.join(BasePath, 'db', 'mongodb', 'client.js')); - -//输出模型 -module.exports = { - sql(dialect='mysql'){ - return async (ctx, next)=>{ - if(!global.MysqlClient || !global.MysqlClient.client){ - global.MysqlClient= new DBMysql(); - await MysqlClient.createClient().then(()=>{ - // 加载所有模型数据文件 - let dir = 'model'; - let model_names = fs.readdirSync(path.join(BasePath , dir)).filter((f) => { - return f.endsWith('.js'); - }); - for (let filename of model_names) { - let name = filename.substring(0, filename.length - 3); - let model = require(path.join(BasePath , dir, filename )); - let _model = MysqlClient.defineSQLModel(model.name, model.attributes); - // if(!ENV_Production){ - // await _model.sync({force: true}); - // } - global['Model'+name] = _model; // 老生代内存 - } - }).catch(async (err)=>{ - throw createError(500, 'Unable to connect to the database'+dialect, {expose:true}); - }) - } - await next(); - } - }, - nosql(dialect='mongodb'){ - return async (ctx, next)=>{ - if(!global.MongodbClient || !global.MongodbClient.client){ - global.MongodbClient = new DBMongo(); - await global.MongodbClient.createClient().then(()=>{ - // 加载所有模型数据文件 - let dir = 'model'; - let model_names = fs.readdirSync(path.join(BasePath , dir)).filter((f) => { - return f.endsWith('.js'); - }); - for (let filename of model_names) { - let name = filename.substring(0, filename.length - 3); - let model = require(path.join(BasePath , dir, filename )); - } - }).catch(async (err)=>{ - throw createError(500, 'Unable to connect to the database '+dialect, {expose:true}); - }); - } - await next(); - } - } + +const fs = require('fs'); +const path = require('path'); +const createError = require('http-errors'); + +const DBMysql = require(path.join(BasePath, 'db', 'mysql', 'client.js')); +const DBMongo = require(path.join(BasePath, 'db', 'mongodb', 'client.js')); + +//输出模型 +module.exports = { + sql(dialect='mysql'){ + return async (ctx, next)=>{ + if(!global.MysqlClient || !global.MysqlClient.client){ + global.MysqlClient= new DBMysql(); + await MysqlClient.createClient().then(()=>{ + // 加载所有模型数据文件 + let dir = 'model'; + let model_names = fs.readdirSync(path.join(BasePath , dir)).filter((f) => { + return f.endsWith('.js'); + }); + for (let filename of model_names) { + let name = filename.substring(0, filename.length - 3); + let model = require(path.join(BasePath , dir, filename )); + let _model = MysqlClient.defineSQLModel(model.name, model.attributes); + // if(!ENV_Production){ + // await _model.sync({force: true}); + // } + global['Model'+name] = _model; // 老生代内存 + } + }).catch(async (err)=>{ + throw createError(500, 'Unable to connect to the database'+dialect, {expose:true}); + }) + } + await next(); + } + }, + nosql(dialect='mongodb'){ + return async (ctx, next)=>{ + if(!global.MongodbClient || !global.MongodbClient.client){ + global.MongodbClient = new DBMongo(); + await global.MongodbClient.createClient().then(()=>{ + // 加载所有模型数据文件 + let dir = 'model'; + let model_names = fs.readdirSync(path.join(BasePath , dir)).filter((f) => { + return f.endsWith('.js'); + }); + for (let filename of model_names) { + let name = filename.substring(0, filename.length - 3); + let model = require(path.join(BasePath , dir, filename )); + } + }).catch(async (err)=>{ + throw createError(500, 'Unable to connect to the database '+dialect, {expose:true}); + }); + } + await next(); + } + } } \ No newline at end of file diff --git a/framework/rest.js b/framework/rest.js index 5e1cd19..e0c9c4f 100644 --- a/framework/rest.js +++ b/framework/rest.js @@ -1,30 +1,30 @@ - -module.exports = { - restify: (pathPrefix) => { - // REST API前缀，默认为/api/: - pathPrefix = pathPrefix || '/api/'; - return async (ctx, next) => { - // 是否是REST API前缀? - if (ctx.request.path.startsWith(pathPrefix)) { - // 绑定rest()方法: - ctx.rest = (data) => { - ctx.response.type = 'application/json'; - ctx.response.body = data; - } - ctx.restError = (code,message) => { - code = code || 'internal:unknown_error'; - message = message || ''; - ctx.response.status = 400; - ctx.response.type = 'application/json'; - ctx.response.body = { - code, - message - } - } - await next(); - } else { - await next(); - } - } - } + +module.exports = { + restify: (pathPrefix) => { + // REST API前缀，默认为/api/: + pathPrefix = pathPrefix || '/api/'; + return async (ctx, next) => { + // 是否是REST API前缀? + if (ctx.request.path.startsWith(pathPrefix)) { + // 绑定rest()方法: + ctx.rest = (data) => { + ctx.response.type = 'application/json'; + ctx.response.body = data; + } + ctx.restError = (code,message) => { + code = code || 'internal:unknown_error'; + message = message || ''; + ctx.response.status = 400; + ctx.response.type = 'application/json'; + ctx.response.body = { + code, + message + } + } + await next(); + } else { + await next(); + } + } + } } \ No newline at end of file diff --git a/framework/view.js b/framework/view.js index 3088188..cb836a4 100644 --- a/framework/view.js +++ b/framework/view.js @@ -1,40 +1,40 @@ - -const nunjucks = require('nunjucks'); - -function createEnv(path, opts) { - var - autoescape = opts.autoescape === undefined ? true : opts.autoescape, - noCache = opts.noCache || false, - watch = opts.watch || false, - throwOnUndefined = opts.throwOnUndefined || false, - env = new nunjucks.Environment( - new nunjucks.FileSystemLoader(path || 'view', { - noCache: noCache, - watch: watch, - }), { - autoescape: autoescape, - throwOnUndefined: throwOnUndefined - }); - if (opts.filters) { - for (var f in opts.filters) { - env.addFilter(f, opts.filters[f]); - } - } - return env; -} - -module.exports = (path, opts)=>{ - // 创建Nunjucks的env对象: - var env = createEnv(path, opts); - return async (ctx, next) => { - // 给ctx绑定render函数: - ctx.render = function (view, model) { - // 把render后的内容赋值给response.body: - ctx.response.body = env.render(view, Object.assign({}, ctx.state || {}, model || {})); - // 设置Content-Type: - ctx.response.type = 'text/html'; - }; - // 继续处理请求: - await next(); - }; + +const nunjucks = require('nunjucks'); + +function createEnv(path, opts) { + var + autoescape = opts.autoescape === undefined ? true : opts.autoescape, + noCache = opts.noCache || false, + watch = opts.watch || false, + throwOnUndefined = opts.throwOnUndefined || false, + env = new nunjucks.Environment( + new nunjucks.FileSystemLoader(path || 'view', { + noCache: noCache, + watch: watch, + }), { + autoescape: autoescape, + throwOnUndefined: throwOnUndefined + }); + if (opts.filters) { + for (var f in opts.filters) { + env.addFilter(f, opts.filters[f]); + } + } + return env; +} + +module.exports = (path, opts)=>{ + // 创建Nunjucks的env对象: + var env = createEnv(path, opts); + return async (ctx, next) => { + // 给ctx绑定render函数: + ctx.render = function (view, model) { + // 把render后的内容赋值给response.body: + ctx.response.body = env.render(view, Object.assign({}, ctx.state || {}, model || {})); + // 设置Content-Type: + ctx.response.type = 'text/html'; + }; + // 继续处理请求: + await next(); + }; }; \ No newline at end of file diff --git a/model/Pet.js b/model/Pet.js index 7b6b00a..db3d277 100644 --- a/model/Pet.js +++ b/model/Pet.js @@ -1,14 +1,14 @@ - -const Sequelize = require('sequelize'); - -module.exports = { - name : "pet" , - attributes:{ - name: Sequelize.STRING(100), - gender: Sequelize.TINYINT, - birth: Sequelize.STRING(10), - createdAt: Sequelize.BIGINT, - updatedAt: Sequelize.BIGINT, - version: Sequelize.BIGINT - } + +const Sequelize = require('sequelize'); + +module.exports = { + name : "pet" , + attributes:{ + name: Sequelize.STRING(100), + gender: Sequelize.TINYINT, + birth: Sequelize.STRING(10), + createdAt: Sequelize.BIGINT, + updatedAt: Sequelize.BIGINT, + version: Sequelize.BIGINT + } } \ No newline at end of file diff --git a/model/User.js b/model/User.js index 834bdc2..a14fccc 100644 --- a/model/User.js +++ b/model/User.js @@ -1,13 +1,13 @@ - -const Sequelize = require('sequelize'); - -module.exports = { - name : "user" , - attributes:{ - namenick: Sequelize.STRING(200), - email: Sequelize.STRING(100), - password:Sequelize.STRING(500), - gender: Sequelize.TINYINT, - birth: Sequelize.STRING(10) - } + +const Sequelize = require('sequelize'); + +module.exports = { + name : "user" , + attributes:{ + namenick: Sequelize.STRING(200), + email: Sequelize.STRING(100), + password:Sequelize.STRING(500), + gender: Sequelize.TINYINT, + birth: Sequelize.STRING(10) + } } \ No newline at end of file diff --git a/pm2.json b/pm2.json index 973b96d..6d921c1 100644 --- a/pm2.json +++ b/pm2.json @@ -1,38 +1,38 @@ -{ - "apps": { - "name": "web-node", - "script": "app.js", - "cwd": "./", - "args": "--env=dev", - "interpreter": "", - "interpreter_args": "", - "watch": true, - "ignore_watch": [ - "node_modules", - "logs" - ], - "exec_mode": "cluster", - "instances": 3, - "max_memory_restart": "1024M", - "error_file": "./logs/web-err.log", - "out_file": "./logs/web-out.log", - "merge_logs": true, - "log_date_format": "YYYY-MM-DD HH:mm:ss", - "min_uptime": "60s", - "max_restarts": 1000, - "force":true, - "autorestart": true, - "cron_restart": "", - "restart_delay": 1000, - "instance_var":"NODE_APP_INSTANCE", - "env": { - "NODE_ENV": "production" - }, - "env_dev": { - "NODE_ENV": "development" - }, - "env_test": { - "NODE_ENV": "test" - } - } -} +{ + "apps": { + "name": "web-node", + "script": "app.js", + "cwd": "./", + "args": "--env=dev", + "interpreter": "", + "interpreter_args": "", + "watch": true, + "ignore_watch": [ + "node_modules", + "logs" + ], + "exec_mode": "cluster", + "instances": 3, + "max_memory_restart": "1024M", + "error_file": "./logs/web-err.log", + "out_file": "./logs/web-out.log", + "merge_logs": true, + "log_date_format": "YYYY-MM-DD HH:mm:ss", + "min_uptime": "60s", + "max_restarts": 1000, + "force":true, + "autorestart": true, + "cron_restart": "", + "restart_delay": 1000, + "instance_var":"NODE_APP_INSTANCE", + "env": { + "NODE_ENV": "production" + }, + "env_dev": { + "NODE_ENV": "development" + }, + "env_test": { + "NODE_ENV": "test" + } + } +} diff --git a/pm2.json.default b/pm2.json.default index 1d5e008..a900c18 100644 --- a/pm2.json.default +++ b/pm2.json.default @@ -1,39 +1,39 @@ -// { -// "apps": { -// "name": "web-node", // 项目名 -// "script": "app.js", // 执行文件 -// "cwd": "./", // 根目录 -// "args": "--env_dev", // 传递给脚本的参数 -// "interpreter": "", // 指定的脚本解释器 -// "interpreter_args": "", // 传递给解释器的参数 -// "watch": true, // 是否监听文件变动然后重启 -// "ignore_watch": [ // 不用监听的文件 -// "node_modules", -// "logs" -// ], -// "exec_mode": "cluster", // 应用启动模式，支持fork和cluster模式 -// "instances": 3, // 应用启动实例个数，仅在cluster模式有效 默认为fork；或者 max -// "max_memory_restart": 8, // 最大内存限制数，超出自动重启 -// "error_file": "./logs/web-err.log", // 错误日志文件 -// "out_file": "./logs/web-out.log", // 正常日志文件 -// "merge_logs": true, // 设置追加日志而不是新建日志 -// "log_date_format": "YYYY-MM-DD HH:mm:ss", // 指定日志文件的时间格式 -// "min_uptime": "60s", // 应用运行少于时间被认为是异常启动 -// "max_restarts": 100, // 最大异常重启次数，即小于min_uptime运行时间重启次数； -// "autorestart": true, // 默认为true, 发生异常的情况下自动重启 -// "cron_restart": "", // crontab时间格式重启应用，目前只支持cluster模式; -// "restart_delay": 1, // 异常重启情况下，延时重启时间 -// "env": { -// "NODE_ENV": "production", // 环境参数，当前指定为生产环境 process.env.NODE_ENV -// "REMOTE_ADDR": "a.b.c.d" // process.env.REMOTE_ADDR -// }, -// "env_dev": { -// "NODE_ENV": "development", // 环境参数，当前指定为开发环境 pm2 start app.js --env_dev -// "REMOTE_ADDR": "127.0.0.1" -// }, -// "env_test": { // 环境参数，当前指定为测试环境 pm2 start app.js --env_test -// "NODE_ENV": "test", -// "REMOTE_ADDR": "" -// } -// } +// { +// "apps": { +// "name": "web-node", // 项目名 +// "script": "app.js", // 执行文件 +// "cwd": "./", // 根目录 +// "args": "--env_dev", // 传递给脚本的参数 +// "interpreter": "", // 指定的脚本解释器 +// "interpreter_args": "", // 传递给解释器的参数 +// "watch": true, // 是否监听文件变动然后重启 +// "ignore_watch": [ // 不用监听的文件 +// "node_modules", +// "logs" +// ], +// "exec_mode": "cluster", // 应用启动模式，支持fork和cluster模式 +// "instances": 3, // 应用启动实例个数，仅在cluster模式有效 默认为fork；或者 max +// "max_memory_restart": 8, // 最大内存限制数，超出自动重启 +// "error_file": "./logs/web-err.log", // 错误日志文件 +// "out_file": "./logs/web-out.log", // 正常日志文件 +// "merge_logs": true, // 设置追加日志而不是新建日志 +// "log_date_format": "YYYY-MM-DD HH:mm:ss", // 指定日志文件的时间格式 +// "min_uptime": "60s", // 应用运行少于时间被认为是异常启动 +// "max_restarts": 100, // 最大异常重启次数，即小于min_uptime运行时间重启次数； +// "autorestart": true, // 默认为true, 发生异常的情况下自动重启 +// "cron_restart": "", // crontab时间格式重启应用，目前只支持cluster模式; +// "restart_delay": 1, // 异常重启情况下，延时重启时间 +// "env": { +// "NODE_ENV": "production", // 环境参数，当前指定为生产环境 process.env.NODE_ENV +// "REMOTE_ADDR": "a.b.c.d" // process.env.REMOTE_ADDR +// }, +// "env_dev": { +// "NODE_ENV": "development", // 环境参数，当前指定为开发环境 pm2 start app.js --env_dev +// "REMOTE_ADDR": "127.0.0.1" +// }, +// "env_test": { // 环境参数，当前指定为测试环境 pm2 start app.js --env_test +// "NODE_ENV": "test", +// "REMOTE_ADDR": "" +// } +// } // } \ No newline at end of file diff --git a/view/base.html b/view/base.html index 2d2d5d2..7f69b12 100644 --- a/view/base.html +++ b/view/base.html @@ -1,10 +1,10 @@ - - - - - - {% block header %}

Unnamed

{% endblock %} - {% block body %}
No body
{% endblock %} - {% block footer %}
copyright
{% endblock %} - + + + + + + {% block header %}

Unnamed

{% endblock %} + {% block body %}
No body
{% endblock %} + {% block footer %}
copyright
{% endblock %} + \ No newline at end of file diff --git a/view/index.html b/view/index.html index 22bd408..d483a78 100644 --- a/view/index.html +++ b/view/index.html @@ -1,44 +1,44 @@ - - - - - - - -

{{where.is}}

-

hello world

-

{{test.time}}

- - - - {% if User %} -
Email: {{User.email}}
- - {% else %} -
- - - -
-
- - - -
- {% endif %} - - -
- - - - -
- - wanglei - knex-loader-blue.png - - - - + + + + + + + +

{{where.is}}

+

hello world

+

{{test.time}}

+ + + + {% if User %} +
Email: {{User.email}}
+ + {% else %} +
+ + + +
+
+ + + +
+ {% endif %} + + +
+ + + + +
+ + wanglei + knex-loader-blue.png + + + + \ No newline at end of file diff --git a/view/wechat.html b/view/wechat.html index c593a0e..63f4905 100644 --- a/view/wechat.html +++ b/view/wechat.html @@ -1,23 +1,23 @@ - - - - - - - - - {% if User %} -
Email: {{User.email}}
- {% else %} - - {% endif %} - telangpu - knex-loader-blue.png - - - - - - - + + + + + + + + + {% if User %} +
Email: {{User.email}}
+ {% else %} + + {% endif %} + telangpu + knex-loader-blue.png + + + + + + + \ No newline at end of file diff --git a/ws.js b/ws.js index 864629b..8513bb8 100644 --- a/ws.js +++ b/ws.js @@ -1,37 +1,37 @@ -const WebSocket = require('ws'); - -class Wechat{ - constructor(){ - this.connected = false; - let ws = new WebSocket('ws://127.0.0.1:9000/test'); - ws.on('open',()=>{ - this.connected = true; - console.log('client connect wss ok'); - this.send('Hi'); - }); - ws.on('message',(message)=>{ - console.log('client received data:',message) - }); - this.ws = ws; - } - - send(message){ - if(this.connected){ - this.ws.send(message); - } - } - - /** - * 渲染、绑定聊天窗口 - * @param {Object} jq_element jquery 对象 - */ - render(jq_element){ - if(this.connected){ - - }else{ - //开始渲染连接中， - //开启定时检查是否已经连接 - //如果已经连接就绑定dom事件 - } - } +const WebSocket = require('ws'); + +class Wechat{ + constructor(){ + this.connected = false; + let ws = new WebSocket('ws://127.0.0.1:9000/test'); + ws.on('open',()=>{ + this.connected = true; + console.log('client connect wss ok'); + this.send('Hi'); + }); + ws.on('message',(message)=>{ + console.log('client received data:',message) + }); + this.ws = ws; + } + + send(message){ + if(this.connected){ + this.ws.send(message); + } + } + + /** + * 渲染、绑定聊天窗口 + * @param {Object} jq_element jquery 对象 + */ + render(jq_element){ + if(this.connected){ + + }else{ + //开始渲染连接中， + //开启定时检查是否已经连接 + //如果已经连接就绑定dom事件 + } + } } \ No newline at end of file diff --git a/wss.js b/wss.js index 5407baa..be1ba6d 100644 --- a/wss.js +++ b/wss.js @@ -1,40 +1,40 @@ - -// 将聊天室中发送的消息都放置到mongodb中 - -const WebSocket = require('ws'); -const Cookies = require('cookies'); - -module.exports = function WebSocketServer(http_server){ - const wss = new WebSocket.Server({ - server : http_server - }); - wss.on('connection',(ws,request)=>{ - let url = request.url; - if(url !== '/wechat'){ - return ws.close(4001, 'Invalid url'); - } - let headers = request.headers; - if(!headers){ - return ws.close(4001, 'Invalid headers'); - } - let cookies = new Cookies(request,{},{keys:CookieKeys}); - let session_nid = cookies.get(session_name, { signed: true }); - if(!session_nid){ - return ws.close(4001, 'Invalid cookie'); - } - - ws.user = global.User || undefined; - ws.wss = wss; - - ws.on('message', function (message) { - ws.wss.clients.forEach(function (client) { - client.send('data from broadcast:'+message, (err)=>{ - if (err) { - console.log('broadcast err',err); - } - }); - }); - }); - - }); + +// 将聊天室中发送的消息都放置到mongodb中 + +const WebSocket = require('ws'); +const Cookies = require('cookies'); + +module.exports = function WebSocketServer(http_server){ + const wss = new WebSocket.Server({ + server : http_server + }); + wss.on('connection',(ws,request)=>{ + let url = request.url; + if(url !== '/wechat'){ + return ws.close(4001, 'Invalid url'); + } + let headers = request.headers; + if(!headers){ + return ws.close(4001, 'Invalid headers'); + } + let cookies = new Cookies(request,{},{keys:CookieKeys}); + let session_nid = cookies.get(session_name, { signed: true }); + if(!session_nid){ + return ws.close(4001, 'Invalid cookie'); + } + + ws.user = global.User || undefined; + ws.wss = wss; + + ws.on('message', function (message) { + ws.wss.clients.forEach(function (client) { + client.send('data from broadcast:'+message, (err)=>{ + if (err) { + console.log('broadcast err',err); + } + }); + }); + }); + + }); } \ No newline at end of file From 78e92e8eef277f4c904fcbe8347c9c95f7877085 Mon Sep 17 00:00:00 2001 From: wlz321 <2505013465@qq.com> Date: Sun, 21 Jun 2020 19:52:21 +0800 Subject: [PATCH 2/2] mysql timezone & manager mysql instance --- db/mysql/client.js | 2 +- framework/model.js | 41 +++++++++++++++++++++++------------------ 2 files changed, 24 insertions(+), 19 deletions(-) diff --git a/db/mysql/client.js b/db/mysql/client.js index 295bd0a..180146f 100644 --- a/db/mysql/client.js +++ b/db/mysql/client.js @@ -14,6 +14,7 @@ class Mysql{ host: config.host, port: config.port, dialect: 'mysql', + timezone:'+08:00', pool: { max: 10, min: 0, @@ -21,7 +22,6 @@ class Mysql{ idle: 10000 } }); - return this.client.authenticate(); } quitClient(){ if(this.client){ diff --git a/framework/model.js b/framework/model.js index 1093dd9..c73332d 100644 --- a/framework/model.js +++ b/framework/model.js @@ -12,25 +12,30 @@ module.exports = { return async (ctx, next)=>{ if(!global.MysqlClient || !global.MysqlClient.client){ global.MysqlClient= new DBMysql(); - await MysqlClient.createClient().then(()=>{ - // 加载所有模型数据文件 - let dir = 'model'; - let model_names = fs.readdirSync(path.join(BasePath , dir)).filter((f) => { - return f.endsWith('.js'); - }); - for (let filename of model_names) { - let name = filename.substring(0, filename.length - 3); - let model = require(path.join(BasePath , dir, filename )); - let _model = MysqlClient.defineSQLModel(model.name, model.attributes); - // if(!ENV_Production){ - // await _model.sync({force: true}); - // } - global['Model'+name] = _model; // 老生代内存 - } - }).catch(async (err)=>{ - throw createError(500, 'Unable to connect to the database'+dialect, {expose:true}); - }) + MysqlClient.createClient() + } + await MysqlClient.getClient().authenticate().catch(async (err)=>{ + console.log(err) + throw createError(500, 'Unable to connect to the database '+dialect, {expose:true}); + }); + + // 加载所有模型数据文件 + let dir = 'model'; + let model_names = fs.readdirSync(path.join(BasePath , dir)).filter((f) => { + return f.endsWith('.js'); + }); + for (let filename of model_names) { + let name = filename.substring(0, filename.length - 3); + let model = require(path.join(BasePath , dir, filename )); + let _model = MysqlClient.defineSQLModel(model.name, model.attributes); + // if(!ENV_Production){ + // await _model.sync({force: true}); + // } + if(!global['Model'+name]){ + global['Model'+name] = _model; // 老生代内存 + } } + await next(); } },