style: 统一代码风格,调整代码格式和注释
This commit is contained in:
parent
cfe9f92013
commit
172c57f85e
@ -5,4 +5,4 @@
|
|||||||
"singleQuote": true,
|
"singleQuote": true,
|
||||||
"printWidth": 100,
|
"printWidth": 100,
|
||||||
"trailingComma": "none"
|
"trailingComma": "none"
|
||||||
}
|
}
|
||||||
|
|||||||
64
app.js
64
app.js
@ -1,24 +1,24 @@
|
|||||||
const createError = require('http-errors');
|
const createError = require('http-errors')
|
||||||
const express = require('express');
|
const express = require('express')
|
||||||
const path = require('path');
|
const path = require('path')
|
||||||
const logger = require('morgan');
|
const logger = require('morgan')
|
||||||
const cors = require('cors');
|
const cors = require('cors')
|
||||||
const session = require('express-session');
|
const session = require('express-session')
|
||||||
const cookieParser = require('cookie-parser');
|
const cookieParser = require('cookie-parser')
|
||||||
const indexRouter = require('./routes/index');
|
const indexRouter = require('./routes/index')
|
||||||
|
|
||||||
// mongodb数据库连接
|
// mongodb数据库连接
|
||||||
// const mongodbConfig = require('./db/mongodb.config');
|
const mongodbConfig = require('./db/mongodb.config')
|
||||||
// sqlite3数据库连接
|
// sqlite3数据库连接
|
||||||
const sqliteConfig = require('./db/sqlite.config');
|
// const sqliteConfig = require('./db/sqlite.config');
|
||||||
|
|
||||||
const loginUtils = require("./utils/LoginUtil");
|
const loginUtils = require('./utils/LoginUtil')
|
||||||
|
|
||||||
const app = express();
|
const app = express()
|
||||||
|
|
||||||
// 导入env
|
// 导入env
|
||||||
require("dotenv").config();
|
require('dotenv').config()
|
||||||
const loginSecret = process.env.SESSION_SECRET;
|
const loginSecret = process.env.SESSION_SECRET
|
||||||
|
|
||||||
// const databaseAccount = process.env.DB_ACCOUNT;
|
// const databaseAccount = process.env.DB_ACCOUNT;
|
||||||
// const databasePassword = process.env.DB_PASSWORD;
|
// const databasePassword = process.env.DB_PASSWORD;
|
||||||
@ -36,39 +36,41 @@ const loginSecret = process.env.SESSION_SECRET;
|
|||||||
// }
|
// }
|
||||||
// )();
|
// )();
|
||||||
|
|
||||||
app.use(logger('dev'));
|
app.use(logger('dev'))
|
||||||
app.use(express.json());
|
app.use(express.json())
|
||||||
app.use(express.urlencoded({ extended: false }));
|
app.use(express.urlencoded({ extended: false }))
|
||||||
app.use(express.static(path.join(__dirname, 'public')));
|
app.use(express.static(path.join(__dirname, 'public')))
|
||||||
app.use(cookieParser());
|
app.use(cookieParser())
|
||||||
app.use(session({
|
app.use(
|
||||||
|
session({
|
||||||
name: 'identityKey',
|
name: 'identityKey',
|
||||||
secret: loginSecret,
|
secret: loginSecret,
|
||||||
resave: false,
|
resave: false,
|
||||||
saveUninitialized: false,
|
saveUninitialized: false,
|
||||||
cookie: {
|
cookie: {
|
||||||
secure: false,
|
secure: false,
|
||||||
maxAge: 1000 * 60 * 10,
|
maxAge: 1000 * 60 * 10
|
||||||
},
|
}
|
||||||
}));
|
})
|
||||||
|
)
|
||||||
|
|
||||||
// app.use('/', loginUtils.aopMiddleware, indexRouter);
|
// app.use('/', loginUtils.aopMiddleware, indexRouter);
|
||||||
app.use('/', indexRouter);
|
app.use('/', indexRouter)
|
||||||
|
|
||||||
// catch 404 and forward to error handler
|
// catch 404 and forward to error handler
|
||||||
app.use(function (req, res, next) {
|
app.use(function (req, res, next) {
|
||||||
// next(createError(404));
|
// next(createError(404));
|
||||||
});
|
})
|
||||||
|
|
||||||
// error handler
|
// error handler
|
||||||
app.use(function (err, req, res, next) {
|
app.use(function (err, req, res, next) {
|
||||||
// set locals, only providing error in development
|
// set locals, only providing error in development
|
||||||
res.locals.message = err.message;
|
res.locals.message = err.message
|
||||||
res.locals.error = req.app.get('env') === 'development' ? err : {};
|
res.locals.error = req.app.get('env') === 'development' ? err : {}
|
||||||
|
|
||||||
// render the error page
|
// render the error page
|
||||||
res.status(err.status || 500);
|
res.status(err.status || 500)
|
||||||
res.render('error');
|
res.render('error')
|
||||||
});
|
})
|
||||||
|
|
||||||
module.exports = app;
|
module.exports = app
|
||||||
|
|||||||
@ -1,10 +1,10 @@
|
|||||||
const userMapper = require("../dao/userMapper");
|
const userMapper = require('../dao/userMapper')
|
||||||
|
|
||||||
exports.user_list = expressAsyncHandler(async (req, res, next) => {
|
exports.user_list = expressAsyncHandler(async (req, res, next) => {
|
||||||
try {
|
try {
|
||||||
const list_users = await userMapper.selectAllUser();
|
const list_users = await userMapper.selectAllUser()
|
||||||
return list_users;
|
return list_users
|
||||||
} catch (err) {
|
} catch (err) {
|
||||||
next(err);
|
next(err)
|
||||||
}
|
}
|
||||||
});
|
})
|
||||||
|
|||||||
@ -1,20 +1,20 @@
|
|||||||
const expressAsyncHandler = require("express-async-handler");
|
const expressAsyncHandler = require('express-async-handler')
|
||||||
|
|
||||||
const User = require("../models/user.model");
|
const User = require('../models/user.model')
|
||||||
|
|
||||||
exports.user_list = expressAsyncHandler(async (req, res, next) => {
|
exports.user_list = expressAsyncHandler(async (req, res, next) => {
|
||||||
try {
|
try {
|
||||||
const list_users = await User.find();
|
const list_users = await User.find()
|
||||||
return list_users;
|
return list_users
|
||||||
} catch (err) {
|
} catch (err) {
|
||||||
next(err);
|
next(err)
|
||||||
}
|
}
|
||||||
});
|
})
|
||||||
|
|
||||||
exports.find_user_login = expressAsyncHandler(async (account) => {
|
exports.find_user_login = expressAsyncHandler(async (account) => {
|
||||||
try {
|
try {
|
||||||
return await User.findOne({ account: account });
|
return await User.findOne({ account: account })
|
||||||
} catch (err) {
|
} catch (err) {
|
||||||
next(err);
|
next(err)
|
||||||
}
|
}
|
||||||
});
|
})
|
||||||
|
|||||||
@ -11,19 +11,25 @@ CREATE TABLE users (
|
|||||||
`update_time` TIMESTAMP DEFAULT (datetime('now', 'localtime'))
|
`update_time` TIMESTAMP DEFAULT (datetime('now', 'localtime'))
|
||||||
);
|
);
|
||||||
|
|
||||||
DELETE FROM USERS
|
DELETE FROM
|
||||||
|
USERS -- Active: 1719656873604@@127.0.0.1@3306
|
||||||
-- Active: 1719656873604@@127.0.0.1@3306
|
INSERT INTO
|
||||||
INSERT
|
users (user_account, user_name, `password`, email)
|
||||||
INTO users (user_account, user_name, `password`, email)
|
|
||||||
VALUES
|
VALUES
|
||||||
('test2', '1', '123456', '2712495353@qq.com');
|
('test2', '1', '123456', '2712495353@qq.com');
|
||||||
|
|
||||||
INSERT
|
INSERT INTO
|
||||||
INTO users (user_account, user_name, `password`, email)
|
users (user_account, user_name, `password`, email)
|
||||||
VALUES
|
VALUES
|
||||||
('test4', '1', '123456', '2712495354@qq.com');
|
('test4', '1', '123456', '2712495354@qq.com');
|
||||||
|
|
||||||
SELECT * FROM `USERS`
|
SELECT
|
||||||
|
*
|
||||||
UPDATE USERS SET PASSWORD = '33' WHERE ID = '7';
|
FROM
|
||||||
|
`USERS`
|
||||||
|
UPDATE
|
||||||
|
USERS
|
||||||
|
SET
|
||||||
|
PASSWORD = '33'
|
||||||
|
WHERE
|
||||||
|
ID = '7';
|
||||||
@ -1,83 +1,83 @@
|
|||||||
var express = require('express');
|
var express = require('express')
|
||||||
var router = express.Router();
|
var router = express.Router()
|
||||||
|
|
||||||
const user_controller = require('../controllers/userController');
|
const user_controller = require('../controllers/userController')
|
||||||
const User = require('../models/user.model');
|
const User = require('../models/user.model')
|
||||||
const userService = require('../service/user.service');
|
const userService = require('../service/user.service')
|
||||||
const StringUtils = require('../utils/StringUtil');
|
const StringUtils = require('../utils/StringUtil')
|
||||||
|
|
||||||
/* GET home page. */
|
/* GET home page. */
|
||||||
router.get('/', function (req, res, next) {
|
router.get('/', function (req, res, next) {
|
||||||
res.send('test');
|
res.send('test')
|
||||||
});
|
})
|
||||||
|
|
||||||
router.get('/user', async function (req, res, next) {
|
router.get('/user', async function (req, res, next) {
|
||||||
console.log(req.session);
|
console.log(req.session)
|
||||||
console.log(req.session.account);
|
console.log(req.session.account)
|
||||||
if (
|
if (
|
||||||
req.session.account === null ||
|
req.session.account === null ||
|
||||||
req.session.account === '' ||
|
req.session.account === '' ||
|
||||||
req.session.account === undefined
|
req.session.account === undefined
|
||||||
) {
|
) {
|
||||||
res.send('not login');
|
res.send('not login')
|
||||||
return;
|
return
|
||||||
}
|
}
|
||||||
let us = await user_controller.user_list();
|
let us = await user_controller.user_list()
|
||||||
us = JSON.stringify(us);
|
us = JSON.stringify(us)
|
||||||
res.send(us);
|
res.send(us)
|
||||||
});
|
})
|
||||||
|
|
||||||
router.post('/login', async function (req, res, next) {
|
router.post('/login', async function (req, res, next) {
|
||||||
const body = req.body;
|
const body = req.body
|
||||||
if (!StringUtils.isNotEmpty(body)) {
|
if (!StringUtils.isNotEmpty(body)) {
|
||||||
return res.json({ ret_code: -1, ret_msg: '登录失败' });
|
return res.json({ ret_code: -1, ret_msg: '登录失败' })
|
||||||
}
|
}
|
||||||
const { account, password } = body;
|
const { account, password } = body
|
||||||
|
|
||||||
if (account === '' || account === undefined || account === null) {
|
if (account === '' || account === undefined || account === null) {
|
||||||
return res.json({ ret_code: -1, ret_msg: '没有填写账号' });
|
return res.json({ ret_code: -1, ret_msg: '没有填写账号' })
|
||||||
}
|
}
|
||||||
if (password === '' || password === undefined || password === null) {
|
if (password === '' || password === undefined || password === null) {
|
||||||
return res.json({ ret_code: -1, ret_msg: '没有填写密码' });
|
return res.json({ ret_code: -1, ret_msg: '没有填写密码' })
|
||||||
}
|
}
|
||||||
|
|
||||||
const user = await user_controller.find_user_login(account);
|
const user = await user_controller.find_user_login(account)
|
||||||
if (!user) {
|
if (!user) {
|
||||||
return res.json({ ret_code: -1, ret_msg: '账号不存在' });
|
return res.json({ ret_code: -1, ret_msg: '账号不存在' })
|
||||||
}
|
}
|
||||||
|
|
||||||
if (user.password != password) {
|
if (user.password != password) {
|
||||||
return res.json({ ret_code: -1, ret_msg: '密码错误' });
|
return res.json({ ret_code: -1, ret_msg: '密码错误' })
|
||||||
}
|
}
|
||||||
|
|
||||||
req.session.regenerate((err) => {
|
req.session.regenerate((err) => {
|
||||||
if (err) {
|
if (err) {
|
||||||
return res.json({ ret_code: -1, ret_msg: '登录失败' });
|
return res.json({ ret_code: -1, ret_msg: '登录失败' })
|
||||||
}
|
}
|
||||||
req.session.account = account;
|
req.session.account = account
|
||||||
res.json({ ret_code: 0, ret_msg: '登录成功' });
|
res.json({ ret_code: 0, ret_msg: '登录成功' })
|
||||||
});
|
})
|
||||||
});
|
})
|
||||||
|
|
||||||
router.get('/logout', async function (req, res, next) {
|
router.get('/logout', async function (req, res, next) {
|
||||||
res.json({ ret_code: 1, ret_msg: '退出登录成功' });
|
res.json({ ret_code: 1, ret_msg: '退出登录成功' })
|
||||||
});
|
})
|
||||||
|
|
||||||
router.post('/register', async function (req, res, next) {
|
router.post('/register', async function (req, res, next) {
|
||||||
const body = req.body;
|
const body = req.body
|
||||||
const { account, username, password } = body;
|
const { account, username, password } = body
|
||||||
|
|
||||||
console.log(account, username, password);
|
console.log(account, username, password)
|
||||||
const user = new User();
|
const user = new User()
|
||||||
user.setUserAccount(account);
|
user.setUserAccount(account)
|
||||||
user.setUserName(username);
|
user.setUserName(username)
|
||||||
user.setPassword(password);
|
user.setPassword(password)
|
||||||
// console.log(user);
|
// console.log(user);
|
||||||
let userMsg;
|
let userMsg
|
||||||
userMsg = await userService.register(user);
|
userMsg = await userService.register(user)
|
||||||
console.log(userMsg.get('userMsg'));
|
console.log(userMsg.get('userMsg'))
|
||||||
|
|
||||||
res.json({ ret_code: 1, ret_msg: userMsg.get('userMsg') });
|
res.json({ ret_code: 1, ret_msg: userMsg.get('userMsg') })
|
||||||
});
|
})
|
||||||
|
|
||||||
module.exports = router;
|
module.exports = router
|
||||||
|
|||||||
@ -1,6 +1,6 @@
|
|||||||
const User = require("../models/user.model");
|
const User = require('../models/user.model')
|
||||||
const userMapper = require("../dao/user.mapper");
|
const userMapper = require('../dao/user.mapper')
|
||||||
const StringUtil = require("../utils/StringUtil");
|
const StringUtil = require('../utils/StringUtil')
|
||||||
|
|
||||||
/**
|
/**
|
||||||
*
|
*
|
||||||
@ -8,34 +8,34 @@ const StringUtil = require("../utils/StringUtil");
|
|||||||
* @returns
|
* @returns
|
||||||
*/
|
*/
|
||||||
exports.register = async (user) => {
|
exports.register = async (user) => {
|
||||||
let messageMap = new Map();
|
let messageMap = new Map()
|
||||||
|
|
||||||
// console.log(user );
|
// console.log(user );
|
||||||
const _user = user;
|
const _user = user
|
||||||
|
|
||||||
if (_user == null) {
|
if (_user == null) {
|
||||||
throw new Error("用户参数不能为空");
|
throw new Error('用户参数不能为空')
|
||||||
}
|
}
|
||||||
|
|
||||||
if (StringUtil.isNotEmpty(_user.getUserAccount)) {
|
if (StringUtil.isNotEmpty(_user.getUserAccount)) {
|
||||||
messageMap.set("userMsg", "账号不能为空");
|
messageMap.set('userMsg', '账号不能为空')
|
||||||
return messageMap;
|
return messageMap
|
||||||
}
|
}
|
||||||
if (StringUtil.isNotEmpty(_user.getUserName)) {
|
if (StringUtil.isNotEmpty(_user.getUserName)) {
|
||||||
messageMap.set("userMsg", "名称不能为空");
|
messageMap.set('userMsg', '名称不能为空')
|
||||||
return messageMap;
|
return messageMap
|
||||||
}
|
}
|
||||||
if (StringUtil.isNotEmpty(_user.getPassword)) {
|
if (StringUtil.isNotEmpty(_user.getPassword)) {
|
||||||
messageMap.set("userMsg", "密码不能为空");
|
messageMap.set('userMsg', '密码不能为空')
|
||||||
return messageMap;
|
return messageMap
|
||||||
}
|
}
|
||||||
|
|
||||||
const u = await userMapper.selectByAccount(_user.user_account);
|
const u = await userMapper.selectByAccount(_user.user_account)
|
||||||
if (u != null) {
|
if (u != null) {
|
||||||
messageMap.set("userMsg", "账户已存在");
|
messageMap.set('userMsg', '账户已存在')
|
||||||
return messageMap;
|
return messageMap
|
||||||
}
|
}
|
||||||
await userMapper.insertUser(_user);
|
await userMapper.insertUser(_user)
|
||||||
messageMap.set("userMsg", "succuss");
|
messageMap.set('userMsg', 'succuss')
|
||||||
return messageMap;
|
return messageMap
|
||||||
}
|
}
|
||||||
@ -1,12 +1,12 @@
|
|||||||
exports.aopMiddleware = function (req, res, next) {
|
exports.aopMiddleware = function (req, res, next) {
|
||||||
console.log(req.url);
|
console.log(req.url)
|
||||||
if (req.url === '/login') {
|
if (req.url === '/login') {
|
||||||
next();
|
next()
|
||||||
} else {
|
} else {
|
||||||
if (req.session.account === undefined) {
|
if (req.session.account === undefined) {
|
||||||
res.status('404').json({ error: 'Acess is denied' });
|
res.status('404').json({ error: 'Acess is denied' })
|
||||||
} else {
|
} else {
|
||||||
next();
|
next()
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -5,15 +5,15 @@
|
|||||||
*/
|
*/
|
||||||
exports.isNotEmpty = function (obj) {
|
exports.isNotEmpty = function (obj) {
|
||||||
if (obj === null || obj === undefined || Object.keys(obj).length === 0) {
|
if (obj === null || obj === undefined || Object.keys(obj).length === 0) {
|
||||||
return false;
|
return false
|
||||||
}
|
}
|
||||||
|
|
||||||
if (obj instanceof String) {
|
if (obj instanceof String) {
|
||||||
return obj === '' ? false : true;
|
return obj === '' ? false : true
|
||||||
}
|
}
|
||||||
|
|
||||||
if (obj instanceof Array) {
|
if (obj instanceof Array) {
|
||||||
return Array.length(obj) === 0 ? false : true;
|
return Array.length(obj) === 0 ? false : true
|
||||||
}
|
}
|
||||||
return true;
|
return true
|
||||||
}
|
}
|
||||||
Loading…
Reference in New Issue
Block a user