Skip to content

Commit

Permalink
chore: 先支持eslit
Browse files Browse the repository at this point in the history
  • Loading branch information
yaogengzhu committed Feb 13, 2023
1 parent 30ce92e commit 7b35470
Show file tree
Hide file tree
Showing 16 changed files with 1,643 additions and 304 deletions.
14 changes: 14 additions & 0 deletions .eslintrc.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
module.exports = {
env: {
node: true
},
extends: 'standard-with-typescript',
overrides: [
],
parserOptions: {
ecmaVersion: 'latest'
},
rules: {
camelcase: [0, { ignoreDestructuring: true }]
}
}
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
node_modules
.env
logs
logs
9 changes: 9 additions & 0 deletions .prettierrc.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
{
"tabWidth": 2,
"useTabs": false,
"endOfLine": "auto",
"singleQuote": true,
"semi": false,
"trailingComma": "none",
"bracketSpacing": true
}
15 changes: 15 additions & 0 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
{
"git.ignoreMissingGitWarning": true,
"eslint.options": {
"extensions": [
".js"
]
},
"emmet.syntaxProfiles": {
"javascript": "js"
},
"editor.fontSize": 12,
"editor.codeActionsOnSave": {
"source.fixAll.eslint": true
}
}
37 changes: 18 additions & 19 deletions app.js
Original file line number Diff line number Diff line change
@@ -1,22 +1,21 @@
const express = require('express');
const app = express();
const router = express.Router();
const user = require('./router/user');
const home = require('./router/home');
const upload = require('./router/upload');
const logger = require('./logger');
app.use(express.json());

router.use(function timeLog(req, res, next) {
console.log('Time: ', Date.now());
next();
});
app.use('/api/user', user);
app.use('/api/', upload);
app.use('/', home);
const express = require('express')
const app = express()
const router = express.Router()
const user = require('./router/user')
const home = require('./router/home')
const upload = require('./router/upload')
const logger = require('./logger')
app.use(express.json())

router.use(function timeLog (req, res, next) {
console.log('Time: ', Date.now())
next()
})
app.use('/api/user', user)
app.use('/api/', upload)
app.use('/', home)

app.listen('3000', () => {
console.log(' serve is running at http://localhost:3000/');
logger.info(' serve is restart')
});
console.log(' serve is running at http://localhost:3000/')
logger.info(' serve is restart')
})
33 changes: 16 additions & 17 deletions db/mysql.js
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
const dotenv = require("dotenv");
const mysql = require("mysql2");
const logger = require("../logger");
dotenv.config();
const dotenv = require('dotenv')
const mysql = require('mysql2')
const logger = require('../logger')
dotenv.config()
const {
DATABASE_MY_HOST,
DATABASE_MY_POST,
DATABASE_NAME,
DATABASE_MY_USERNAME,
DATABASE_MY_PASSWORD,
} = process.env;
console.log(dotenv.config());
DATABASE_MY_PASSWORD
} = process.env
console.log(dotenv.config())
const connection = mysql.createConnection({
host: DATABASE_MY_HOST,
port: DATABASE_MY_POST,
Expand All @@ -19,24 +19,23 @@ const connection = mysql.createConnection({
waitForConnections: true,
connectionLimit: 20,
queueLimit: 0
});
})

function handleError(err) {
function handleError (err) {
if (err) {
// 如果是连接断开,自动重新连接
if (err.code === 'PROTOCOL_CONNECTION_LOST') {
logger.info('数据库连接断开,正在重新连接...');
connection.connect();
logger.info('数据库连接断开,正在重新连接...')
connection.connect()
} else {
logger._log('数据🔗断开、重新连接失败', err);
console.error(err.stack || err);
logger._log('数据🔗断开、重新连接失败', err)
console.error(err.stack || err)
}
}
}
connection.connect(handleError)
connection.on('error', handleError);

connection.on('error', handleError)

module.exports = {
connection,
};
connection
}
30 changes: 15 additions & 15 deletions logger/index.js
Original file line number Diff line number Diff line change
@@ -1,26 +1,26 @@
const log4js = require("log4js");
const log4js = require('log4js')
log4js.configure({
appenders: {
dateFile: {
type: "dateFile",
filename: "logs/logs.log",
pattern: "-yyyy-MM-dd",
type: 'dateFile',
filename: 'logs/logs.log',
pattern: '-yyyy-MM-dd',
alwaysIncludePattern: true,
compress: true,
compress: true
},
console: {
type: "console",
},
type: 'console'
}
},
categories: {
default: {
appenders: ["dateFile", 'console'],
level: "info",
},
},
});
appenders: ['dateFile', 'console'],
level: 'info'
}
}
})

const logger = log4js.getLogger();
logger.level = "debug";
const logger = log4js.getLogger()
logger.level = 'debug'

module.exports = logger;
module.exports = logger
54 changes: 27 additions & 27 deletions middleware/auth.js
Original file line number Diff line number Diff line change
@@ -1,31 +1,31 @@
const tokenSalt = 'token_secret';
const jwt = require('jsonwebtoken');
const { connection } = require('../db/mysql');
const tokenSalt = 'token_secret'
const jwt = require('jsonwebtoken')
const { connection } = require('../db/mysql')

const auth = (req, res, next) => {
const raw = String(req.headers.authorization).split(' ').pop();
let tokenData = {};
try {
tokenData = jwt.verify(raw, tokenSalt);
} catch (e) {
res.send({
code: 0,
msg: '无效token',
});
const raw = String(req.headers.authorization).split(' ').pop()
let tokenData = {}
try {
tokenData = jwt.verify(raw, tokenSalt)
} catch (e) {
res.send({
code: 0,
msg: '无效token'
})
}
const { id } = tokenData
const sql = `select * from user where id = ${id}`
connection.query(sql, (err, data) => {
if (err) {
res.send({
code: 0,
msg: '系统错误'
})
return
}
const { id } = tokenData;
const sql = `select * from user where id = ${id}`;
connection.query(sql, (err, data) => {
if (err) {
res.send({
code: 0,
msg: '系统错误',
});
return;
}
req.user = data[0];
next();
});
};
req.user = data[0]
next()
})
}

module.exports = auth;
module.exports = auth
24 changes: 12 additions & 12 deletions mock/user.js
Original file line number Diff line number Diff line change
@@ -1,18 +1,18 @@
const Mock = require("mockjs");
const Mock = require('mockjs')

var data = Mock.mock({
const data = Mock.mock({
// 属性 list 的值是一个数组,其中含有 1 到 10 个元素
"list|100": [
'list|100': [
{
// 属性 id 是一个自增数,起始值为 1,每次增 1
"id|+1": 1,
name: "@first",
"age|18-28": 25,
"staff|1": ["前端", "后端", "测试", "运维", "产品", "设计"],
},
],
});
'id|+1': 1,
name: '@first',
'age|18-28': 25,
'staff|1': ['前端', '后端', '测试', '运维', '产品', '设计']
}
]
})

module.exports = {
data,
};
data
}
8 changes: 8 additions & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -21,5 +21,13 @@
"multiparty": "^4.2.3",
"mysql2": "^2.3.3",
"nodemon": "^2.0.20"
},
"devDependencies": {
"@typescript-eslint/eslint-plugin": "^5.0.0",
"eslint": "^8.0.1",
"eslint-config-standard-with-typescript": "^34.0.0",
"eslint-plugin-import": "^2.25.2",
"eslint-plugin-n": "^15.0.0",
"eslint-plugin-promise": "^6.0.0"
}
}
12 changes: 6 additions & 6 deletions router/home/index.js
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
const express = require('express');
const router = express.Router();
const express = require('express')
const router = express.Router()

// 获取用户信息
router.get('/', async (req, res) => {
const html = `
const html = `
<div>
<h1>数据库服务</h1>
</div>
`
res.send(html);
});
res.send(html)
})

module.exports = router;
module.exports = router
22 changes: 10 additions & 12 deletions router/mock/index.js
Original file line number Diff line number Diff line change
@@ -1,20 +1,18 @@
const { connection } = require("../../db/mysql");
const { data } = require("../../mock/user");
console.log(data, 'list');
const { list } = data;
const sql = 'insert into emp(name, age, staff, create_time) values (?,?,?, now())';
const { connection } = require('../../db/mysql')
const { data } = require('../../mock/user')
const sql = 'insert into emp(name, age, staff, create_time) values (?,?,?, now())'

function insetIntoUser(obj) {
function insetIntoUser (obj) {
obj.list.forEach((item) => {
const { name, age, staff } = item;
const { name, age, staff } = item
connection.query(sql, [name, age, staff], (err, result) => {
if (err) {
console.log(err, 'err');
return;
console.log(err, 'err')
return
}
console.log('写入成功');
console.log('写入成功')
})
});
})
}

insetIntoUser(data);
insetIntoUser(data)
14 changes: 7 additions & 7 deletions router/upload/config.js
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
const COS = require('cos-nodejs-sdk-v5');
const dotenv = require("dotenv");
dotenv.config();
const {SECRET_ID, SECRET_KEY} = process.env;
const COS = require('cos-nodejs-sdk-v5')
const dotenv = require('dotenv')
dotenv.config()
const { SECRET_ID, SECRET_KEY } = process.env

dotenv.config();
dotenv.config()
const cos = new COS({
SecretId: SECRET_ID,
SecretKey: SECRET_KEY,
SecretKey: SECRET_KEY
})

module.exports = cos
module.exports = cos
Loading

0 comments on commit 7b35470

Please sign in to comment.