Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions server.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
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 app = require('./src/bin/app')
// 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`)
Expand Down
3 changes: 2 additions & 1 deletion src/lib/dbConnection.js
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
25 changes: 2 additions & 23 deletions src/lib/log.js
Original file line number Diff line number Diff line change
Expand Up @@ -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: {
Expand All @@ -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 {
Expand All @@ -65,4 +44,4 @@ export default class {
async tatal(msg) {
log4js.getLogger('fatal').fatal(msg)
}
}
}
7 changes: 4 additions & 3 deletions src/routes/user/user.controller.js
Original file line number Diff line number Diff line change
Expand Up @@ -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()
}
// 判断用户名是否已经被使用
// 为了演示,这里就简单处理,常规业务这里有四种种实现方式
Expand All @@ -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 },
Expand All @@ -57,4 +58,4 @@ export default class UserController {
data: 'success',
}
}
}
}