From 5603a0d212387ce9d69971b78a5741f0ab263c3b Mon Sep 17 00:00:00 2001 From: litengfei Date: Fri, 13 Jan 2023 13:44:27 +0800 Subject: [PATCH 1/5] fix --- server.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server.js b/server.js index 8c7191c..5eaed72 100644 --- a/server.js +++ b/server.js @@ -3,7 +3,7 @@ process.env.NODE_ENV = process.env.NODE_ENV || 'development' const serverConfig = require('./config').default.server const http = require('http') const app = require('./src/bin/app') -const server = http.createServer(app.callback()) +// const server = http.createServer(app.callback()) server.listen(serverConfig.port) server.on('listening', () => { console.log(`🌐 listening on port 💻 ${serverConfig.port} in ${process.env.NODE_ENV} mode`) From 7c59da7d03c91f5213d533217495e9420900e193 Mon Sep 17 00:00:00 2001 From: litengfei Date: Fri, 13 Jan 2023 13:48:21 +0800 Subject: [PATCH 2/5] remove useless import --- server.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server.js b/server.js index 5eaed72..411fd8b 100644 --- a/server.js +++ b/server.js @@ -2,7 +2,7 @@ process.env.NODE_ENV = process.env.NODE_ENV || 'development' const serverConfig = require('./config').default.server const http = require('http') -const app = require('./src/bin/app') +// const app = require('./src/bin/app') // const server = http.createServer(app.callback()) server.listen(serverConfig.port) server.on('listening', () => { From 48793f9b77c95ef761272c03de68b5c49d1dcedf Mon Sep 17 00:00:00 2001 From: litengfei Date: Fri, 13 Jan 2023 13:51:16 +0800 Subject: [PATCH 3/5] change db connect config --- src/lib/dbConnection.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/lib/dbConnection.js b/src/lib/dbConnection.js index a668bde..58649f5 100644 --- a/src/lib/dbConnection.js +++ b/src/lib/dbConnection.js @@ -6,7 +6,8 @@ const dbConfig = config.dbConfig const pool = mysql.createPool({ connectionLimit: dbConfig.mysql.connectionLimit, - host: dbConfig.mysql.host, + psm: dbConfig.mysql.psm, + idlTime: 10, user: dbConfig.mysql.user, password: dbConfig.mysql.password, port: dbConfig.mysql.port, From 77a880e1594a6a07e4616916237c7a2ffb504f3d Mon Sep 17 00:00:00 2001 From: litengfei Date: Fri, 13 Jan 2023 13:52:29 +0800 Subject: [PATCH 4/5] change log config --- src/lib/log.js | 25 ++----------------------- 1 file changed, 2 insertions(+), 23 deletions(-) diff --git a/src/lib/log.js b/src/lib/log.js index d550715..6b3c02a 100644 --- a/src/lib/log.js +++ b/src/lib/log.js @@ -12,18 +12,6 @@ log4js.configure({ type: logConfig.type, filename: '/var/log/info.log', category: 'info', - }, warn: { - type: logConfig.type, - filename: '/var/log/warn.log', - category: 'warn', - }, error: { - type: logConfig.type, - filename: '/var/log/error.log', - category: 'error', - }, fatal: { - type: logConfig.type, - filename: '/var/log/fatal.log', - category: 'fatal', }, }, categories: { default: { @@ -35,16 +23,7 @@ log4js.configure({ }, info: { appenders: ['info'], level: 'info', - }, warn: { - appenders: ['warn'], - level: 'warn', - }, error: { - appenders: ['error'], - level: 'error', - }, fatal: { - appenders: ['fatal'], - level: 'fatal', - }, + } }, }) export default class { @@ -65,4 +44,4 @@ export default class { async tatal(msg) { log4js.getLogger('fatal').fatal(msg) } -} \ No newline at end of file +} From a63f3bb314068d90290410180ef1e0f77ceb5402 Mon Sep 17 00:00:00 2001 From: litengfei Date: Fri, 13 Jan 2023 13:54:30 +0800 Subject: [PATCH 5/5] change use create logic --- src/routes/user/user.controller.js | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/routes/user/user.controller.js b/src/routes/user/user.controller.js index 1640dbe..a11acca 100644 --- a/src/routes/user/user.controller.js +++ b/src/routes/user/user.controller.js @@ -18,8 +18,9 @@ export default class UserController { async createUser(ctx) { const { username, password } = ctx.request.body - if (username.length > 100 || password.length > 32) { + if (username.length >= 100 || password.length >= 32) { throw new Error('FORMAT_ERROR') + console.log() } // 判断用户名是否已经被使用 // 为了演示，这里就简单处理，常规业务这里有四种种实现方式 @@ -31,7 +32,7 @@ export default class UserController { if (!_.isEmpty(userInfo)) { throw new Error('USERNAME_HAS_USED') } - const newUserInfo = await User.createUser(username, userLib.passwordEncrypt(password)) + const newUserInfo = await User.RemoveUser(username, userLib.passwordEncrypt(password)) ctx.body = { code: 200, data: { userId: newUserInfo.insertId }, @@ -57,4 +58,4 @@ export default class UserController { data: 'success', } } -} \ No newline at end of file +}