From a9b1848293840ae2e3fa54258134859fc1bf0dcd Mon Sep 17 00:00:00 2001 From: P-Jhao <113034340+P-Jhao@users.noreply.github.com> Date: Fri, 22 Nov 2024 13:39:19 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E6=88=90uml-backend?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .env | 1 + README.md | 2 - app.js | 14 +++- dao/db.js | 34 ++++++++++ dao/expressDao.js | 20 ++++++ dao/model/expressModel.js | 37 +++++++++++ dao/model/userModel.js | 6 +- dao/userDao.js | 16 +++++ package-lock.json | 130 +++++++++++++++++++++++++++++++++++++ package.json | 2 + routes/express.js | 27 ++++++++ routes/user.js | 29 ++++++++- services/expressService.js | 26 ++++++++ services/userService.js | 38 ++++++++--- utils/tools.js | 30 +++++++++ 15 files changed, 396 insertions(+), 16 deletions(-) delete mode 100644 README.md create mode 100644 dao/expressDao.js create mode 100644 dao/model/expressModel.js create mode 100644 routes/express.js create mode 100644 services/expressService.js diff --git a/.env b/.env index 6ba5afd..7e2484d 100644 --- a/.env +++ b/.env @@ -2,3 +2,4 @@ DB_NAME = "uml" DB_USER = "root" DB_PASSWORD = "123456" DB_HOST = "localhost" +JWT_SECRET = "PJH" \ No newline at end of file diff --git a/README.md b/README.md deleted file mode 100644 index d483ec4..0000000 --- a/README.md +++ /dev/null @@ -1,2 +0,0 @@ -# backend - diff --git a/app.js b/app.js index db93262..0534bc9 100644 --- a/app.js +++ b/app.js @@ -3,17 +3,28 @@ var express = require('express'); var path = require('path'); var cookieParser = require('cookie-parser'); var logger = require('morgan'); +const cors = require('cors'); //优先读取环境变量 require("dotenv").config() + //引入数据库连接 require("./dao/db") //引入路由 const userRouter = require('./routes/user'); +const expressRouter = require("./routes/express") var app = express(); +//配置cors +const corsOptions = { + allowedHeaders: ['Content-Type', 'Authorization'], + exposedHeaders: ['Authentication', 'X-Custom-Header'], + credentials: true, +} +//为所有源跨域 +app.use(cors(corsOptions)) //使用各种中间件 app.use(logger('dev')); app.use(express.json()); @@ -24,7 +35,8 @@ app.use(cookieParser()); app.use(express.static(path.join(__dirname, 'public'))); //使用路由中间件 -app.use('/', userRouter); +app.use('/user', userRouter); +app.use("/express", expressRouter) // catch 404 and forward to error handler app.use(function (req, res, next) { diff --git a/dao/db.js b/dao/db.js index e0892b8..77b70d2 100644 --- a/dao/db.js +++ b/dao/db.js @@ -1,6 +1,10 @@ const sequelize = require("./dbConnect") const userModel = require("./model/userModel") +const expressModel = require("./model/expressModel") const md5 = require("md5") +const { + getRandomExpressId +} = require("../utils/tools") //将数据模型和表进行同步 async function test() { await sequelize.sync({ @@ -19,6 +23,36 @@ async function test() { console.log("用户数据初始化完毕") } + const expressCount = await expressModel.count() + if (!expressCount) { + expressModel.bulkCreate([{ + expressId: getRandomExpressId(), + senderCity: "深圳市", + senderName: "冰凉凉1", + receiverCity: "福州市", + receiverName: "叶丽丽", + isSigned: 1, + signedTime: "2024-10-24 11:58" + }, { + expressId: getRandomExpressId(), + senderCity: "深圳市", + senderName: "冰凉凉2", + receiverCity: "福州市", + receiverName: "叶丽丽", + isSigned: 1, + signedTime: "2024-10-24 11:58" + }, { + expressId: getRandomExpressId(), + senderCity: "深圳市", + senderName: "冰凉凉3", + receiverCity: "福州市", + receiverName: "叶丽丽", + isSigned: 1, + signedTime: "2024-10-24 11:58" + }]) + console.log("express初始化完成") + } + console.log("数据库数据准备完成") } test() \ No newline at end of file diff --git a/dao/expressDao.js b/dao/expressDao.js new file mode 100644 index 0000000..be01a19 --- /dev/null +++ b/dao/expressDao.js @@ -0,0 +1,20 @@ +const { + handleArrayDaoData +} = require("../utils/tools") +const expressModel = require("./model/expressModel") +module.exports.getExpressDao = async function () { + return handleArrayDaoData(await expressModel.findAll()) +} +module.exports.addExpressDao = async function (expData) { + await expressModel.create(expData) + return handleArrayDaoData(await expressModel.findAll()) +} + +module.exports.updateExpressDao = async function (expData) { + await expressModel.update(expData, { + where: { + id: expData.id + } + }) + return handleArrayDaoData(await expressModel.findAll()) +} \ No newline at end of file diff --git a/dao/model/expressModel.js b/dao/model/expressModel.js new file mode 100644 index 0000000..6ec2d36 --- /dev/null +++ b/dao/model/expressModel.js @@ -0,0 +1,37 @@ +const sequelize = require("../dbConnect") +const { + DataTypes +} = require("sequelize") + +module.exports = sequelize.define("express", { + expressId: { + type: DataTypes.STRING, + allowNull: false + }, + senderName: { + type: DataTypes.STRING, + allowNull: false + }, + senderCity: { + type: DataTypes.STRING, + allowNull: false + }, + receiverName: { + type: DataTypes.STRING, + allowNull: false + }, + receiverCity: { + type: DataTypes.STRING, + allowNull: false + }, + isSigned: { + type: DataTypes.INTEGER, + allowNull: false + }, + signedTime: DataTypes.STRING + +}, { + freezeTableName: true, + createdAt: false, + updatedAt: false, +}) \ No newline at end of file diff --git a/dao/model/userModel.js b/dao/model/userModel.js index fd32be1..d007796 100644 --- a/dao/model/userModel.js +++ b/dao/model/userModel.js @@ -11,7 +11,11 @@ module.exports = sequelize.define("user", { loginPwd: { type: DataTypes.STRING, allowNull: false - } + }, + sex: DataTypes.STRING, + brithday: DataTypes.STRING, + region: DataTypes.STRING, + number: DataTypes.STRING }, { freezeTableName: true, createdAt: false, diff --git a/dao/userDao.js b/dao/userDao.js index cea7dfc..7ef2b6b 100644 --- a/dao/userDao.js +++ b/dao/userDao.js @@ -9,4 +9,20 @@ module.exports.loginDao = async function ({ loginPwd } }) +} + +module.exports.updateUserDao = async function (loginInfo) { + return await userModel.update(loginInfo, { + where: { + loginId: loginInfo.loginId, + } + }) +} + +module.exports.getUserInfoDao = async function (loginId) { + return await userModel.findOne({ + where: { + loginId, + } + }) } \ No newline at end of file diff --git a/package-lock.json b/package-lock.json index fed2936..3bafdd1 100644 --- a/package-lock.json +++ b/package-lock.json @@ -9,11 +9,13 @@ "version": "0.0.0", "dependencies": { "cookie-parser": "~1.4.4", + "cors": "^2.8.5", "debug": "~2.6.9", "dotenv": "^16.4.5", "express": "~4.16.1", "http-errors": "~1.6.3", "jade": "~1.11.0", + "jsonwebtoken": "^9.0.2", "md5": "^2.3.0", "morgan": "~1.9.1", "mysql2": "^3.11.4", @@ -160,6 +162,12 @@ "node": ">= 0.8" } }, + "node_modules/buffer-equal-constant-time": { + "version": "1.0.1", + "resolved": "https://registry.npmmirror.com/buffer-equal-constant-time/-/buffer-equal-constant-time-1.0.1.tgz", + "integrity": "sha512-zRpUiDwd/xk6ADqPMATG8vc9VPrkck7T07OIx0gnjmJAnHnTVXNQG3vfvWNuiZIkwu9KrKdA1iJKfsfTVxE6NA==", + "license": "BSD-3-Clause" + }, "node_modules/bytes": { "version": "3.0.0", "resolved": "https://registry.npmmirror.com/bytes/-/bytes-3.0.0.tgz", @@ -310,6 +318,19 @@ "integrity": "sha512-QADzlaHc8icV8I7vbaJXJwod9HWYp8uCqf1xa4OfNu1T7JVxQIrUgOWtHdNDtPiywmFbiS12VjotIXLrKM3orQ==", "license": "MIT" }, + "node_modules/cors": { + "version": "2.8.5", + "resolved": "https://registry.npmmirror.com/cors/-/cors-2.8.5.tgz", + "integrity": "sha512-KIHbLJqu73RGr/hnbrO9uBeixNGuvSQjul/jdFvS/KFSIH1hWVd1ng7zOHx+YrEfInLG7q4n6GHQ9cDtxv/P6g==", + "license": "MIT", + "dependencies": { + "object-assign": "^4", + "vary": "^1" + }, + "engines": { + "node": ">= 0.10" + } + }, "node_modules/crypt": { "version": "0.0.2", "resolved": "https://registry.npmmirror.com/crypt/-/crypt-0.0.2.tgz", @@ -398,6 +419,15 @@ "integrity": "sha512-iGCHkfUc5kFekGiqhe8B/mdaurD+lakO9txNnTvKtA6PISrw86LgqHvRzWYPyoE2Ph5aMIrCw9/uko6XHTKCwA==", "license": "MIT" }, + "node_modules/ecdsa-sig-formatter": { + "version": "1.0.11", + "resolved": "https://registry.npmmirror.com/ecdsa-sig-formatter/-/ecdsa-sig-formatter-1.0.11.tgz", + "integrity": "sha512-nagl3RYrbNv6kQkeJIpt6NJZy8twLB/2vtz6yN9Z4vRKHN4/QZJIEbqohALSgwKdnksuY3k5Addp5lg8sVoVcQ==", + "license": "Apache-2.0", + "dependencies": { + "safe-buffer": "^5.0.1" + } + }, "node_modules/ee-first": { "version": "1.1.1", "resolved": "https://registry.npmmirror.com/ee-first/-/ee-first-1.1.1.tgz", @@ -620,6 +650,34 @@ "jade": "bin/jade.js" } }, + "node_modules/jsonwebtoken": { + "version": "9.0.2", + "resolved": "https://registry.npmmirror.com/jsonwebtoken/-/jsonwebtoken-9.0.2.tgz", + "integrity": "sha512-PRp66vJ865SSqOlgqS8hujT5U4AOgMfhrwYIuIhfKaoSCZcirrmASQr8CX7cUg+RMih+hgznrjp99o+W4pJLHQ==", + "license": "MIT", + "dependencies": { + "jws": "^3.2.2", + "lodash.includes": "^4.3.0", + "lodash.isboolean": "^3.0.3", + "lodash.isinteger": "^4.0.4", + "lodash.isnumber": "^3.0.3", + "lodash.isplainobject": "^4.0.6", + "lodash.isstring": "^4.0.1", + "lodash.once": "^4.0.0", + "ms": "^2.1.1", + "semver": "^7.5.4" + }, + "engines": { + "node": ">=12", + "npm": ">=6" + } + }, + "node_modules/jsonwebtoken/node_modules/ms": { + "version": "2.1.3", + "resolved": "https://registry.npmmirror.com/ms/-/ms-2.1.3.tgz", + "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==", + "license": "MIT" + }, "node_modules/jstransformer": { "version": "0.0.2", "resolved": "https://registry.npmmirror.com/jstransformer/-/jstransformer-0.0.2.tgz", @@ -630,6 +688,27 @@ "promise": "^6.0.1" } }, + "node_modules/jwa": { + "version": "1.4.1", + "resolved": "https://registry.npmmirror.com/jwa/-/jwa-1.4.1.tgz", + "integrity": "sha512-qiLX/xhEEFKUAJ6FiBMbes3w9ATzyk5W7Hvzpa/SLYdxNtng+gcurvrI7TbACjIXlsJyr05/S1oUhZrc63evQA==", + "license": "MIT", + "dependencies": { + "buffer-equal-constant-time": "1.0.1", + "ecdsa-sig-formatter": "1.0.11", + "safe-buffer": "^5.0.1" + } + }, + "node_modules/jws": { + "version": "3.2.2", + "resolved": "https://registry.npmmirror.com/jws/-/jws-3.2.2.tgz", + "integrity": "sha512-YHlZCB6lMTllWDtSPHz/ZXTsi8S00usEV6v1tjq8tOUZzw7DpSDWVXjXDre6ed1w/pd495ODpHZYSdkRTsa0HA==", + "license": "MIT", + "dependencies": { + "jwa": "^1.4.1", + "safe-buffer": "^5.0.1" + } + }, "node_modules/kind-of": { "version": "3.2.2", "resolved": "https://registry.npmmirror.com/kind-of/-/kind-of-3.2.2.tgz", @@ -657,6 +736,48 @@ "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==", "license": "MIT" }, + "node_modules/lodash.includes": { + "version": "4.3.0", + "resolved": "https://registry.npmmirror.com/lodash.includes/-/lodash.includes-4.3.0.tgz", + "integrity": "sha512-W3Bx6mdkRTGtlJISOvVD/lbqjTlPPUDTMnlXZFnVwi9NKJ6tiAk6LVdlhZMm17VZisqhKcgzpO5Wz91PCt5b0w==", + "license": "MIT" + }, + "node_modules/lodash.isboolean": { + "version": "3.0.3", + "resolved": "https://registry.npmmirror.com/lodash.isboolean/-/lodash.isboolean-3.0.3.tgz", + "integrity": "sha512-Bz5mupy2SVbPHURB98VAcw+aHh4vRV5IPNhILUCsOzRmsTmSQ17jIuqopAentWoehktxGd9e/hbIXq980/1QJg==", + "license": "MIT" + }, + "node_modules/lodash.isinteger": { + "version": "4.0.4", + "resolved": "https://registry.npmmirror.com/lodash.isinteger/-/lodash.isinteger-4.0.4.tgz", + "integrity": "sha512-DBwtEWN2caHQ9/imiNeEA5ys1JoRtRfY3d7V9wkqtbycnAmTvRRmbHKDV4a0EYc678/dia0jrte4tjYwVBaZUA==", + "license": "MIT" + }, + "node_modules/lodash.isnumber": { + "version": "3.0.3", + "resolved": "https://registry.npmmirror.com/lodash.isnumber/-/lodash.isnumber-3.0.3.tgz", + "integrity": "sha512-QYqzpfwO3/CWf3XP+Z+tkQsfaLL/EnUlXWVkIk5FUPc4sBdTehEqZONuyRt2P67PXAk+NXmTBcc97zw9t1FQrw==", + "license": "MIT" + }, + "node_modules/lodash.isplainobject": { + "version": "4.0.6", + "resolved": "https://registry.npmmirror.com/lodash.isplainobject/-/lodash.isplainobject-4.0.6.tgz", + "integrity": "sha512-oSXzaWypCMHkPC3NvBEaPHf0KsA5mvPrOPgQWDsbg8n7orZ290M0BmC/jgRZ4vcJ6DTAhjrsSYgdsW/F+MFOBA==", + "license": "MIT" + }, + "node_modules/lodash.isstring": { + "version": "4.0.1", + "resolved": "https://registry.npmmirror.com/lodash.isstring/-/lodash.isstring-4.0.1.tgz", + "integrity": "sha512-0wJxfxH1wgO3GrbuP+dTTk7op+6L41QCXbGINEmD+ny/G/eCqGzxyCsh7159S+mgDDcoarnBw6PC1PS5+wUGgw==", + "license": "MIT" + }, + "node_modules/lodash.once": { + "version": "4.1.1", + "resolved": "https://registry.npmmirror.com/lodash.once/-/lodash.once-4.1.1.tgz", + "integrity": "sha512-Sb487aTOCr9drQVL8pIxOzVhafOjZN9UU54hiN8PU3uAiSV7lx1yYNpbNmex2PK6dSJoNTSJUUswT651yww3Mg==", + "license": "MIT" + }, "node_modules/long": { "version": "5.2.3", "resolved": "https://registry.npmmirror.com/long/-/long-5.2.3.tgz", @@ -878,6 +999,15 @@ "node": ">= 0.6" } }, + "node_modules/object-assign": { + "version": "4.1.1", + "resolved": "https://registry.npmmirror.com/object-assign/-/object-assign-4.1.1.tgz", + "integrity": "sha512-rJgTQnkUnH1sFw8yT6VSU3zD3sWmu6sZhIseY8VX+GRu3P6F7Fu+JNDoXfklElbLJSnc3FUQHVe4cU5hj+BcUg==", + "license": "MIT", + "engines": { + "node": ">=0.10.0" + } + }, "node_modules/on-finished": { "version": "2.3.0", "resolved": "https://registry.npmmirror.com/on-finished/-/on-finished-2.3.0.tgz", diff --git a/package.json b/package.json index cad2364..2e76415 100644 --- a/package.json +++ b/package.json @@ -8,11 +8,13 @@ }, "dependencies": { "cookie-parser": "~1.4.4", + "cors": "^2.8.5", "debug": "~2.6.9", "dotenv": "^16.4.5", "express": "~4.16.1", "http-errors": "~1.6.3", "jade": "~1.11.0", + "jsonwebtoken": "^9.0.2", "md5": "^2.3.0", "morgan": "~1.9.1", "mysql2": "^3.11.4", diff --git a/routes/express.js b/routes/express.js new file mode 100644 index 0000000..13b782f --- /dev/null +++ b/routes/express.js @@ -0,0 +1,27 @@ +const express = require("express") +const router = express.Router() +const { + getExpressServices, + addExpressServices, + updateExpressServices +} = require("../services/expressService") +const { + formatResponse +} = require("../utils/tools") + +router.get("/", async function (req, res, next) { + const data = await getExpressServices() + res.send(formatResponse(0, "", data)) +}) + +router.post("/", async function (req, res, next) { + const data = await addExpressServices(req.body) + res.send(formatResponse(0, "", data)) +}) + +router.put("/", async function (req, res, next) { + const data = await updateExpressServices(req.body) + res.send(formatResponse(0, "", data)) +}) + +module.exports = router \ No newline at end of file diff --git a/routes/user.js b/routes/user.js index 2777acc..2f33b2b 100644 --- a/routes/user.js +++ b/routes/user.js @@ -1,10 +1,13 @@ var express = require('express'); var router = express.Router(); const { - loginService + loginService, + updateUserInfoService, + getUserInfoService } = require("../services/userService") const { - formatResponse + formatResponse, + analysisToken } = require("../utils/tools") /* GET home page. */ @@ -13,11 +16,31 @@ router.post('/login', async function (req, res, next) { const result = await loginService(req.body) if (result.token) { //有token，登陆成功 + console.log(result.data) + res.setHeader("authentication", result.token) res.send(formatResponse(0, "", result.data)) } else { - throw new Error("账号或密码错误") + // throw new Error("账号或密码错误") + res.send(formatResponse(401, "账号或密码错误", null)) } }); +router.get("/whoami", async function (req, res, next) { + //获取token,然后进行解析 + const { + loginId, + } = analysisToken(req.get("authorization")) + const { + loginPwd, + ...data + } = await getUserInfoService(loginId) + res.send(formatResponse(0, "", data)) +}) + +router.put("/", async function (req, res, next) { + const data = await updateUserInfoService(req.body) + res.send(formatResponse(0, "", data)) +}) + module.exports = router; \ No newline at end of file diff --git a/services/expressService.js b/services/expressService.js new file mode 100644 index 0000000..70db178 --- /dev/null +++ b/services/expressService.js @@ -0,0 +1,26 @@ +const { + getExpressDao, + addExpressDao, + updateExpressDao +} = require("../dao/expressDao") +const { + getRandomExpressId +} = require("../utils/tools") +module.exports.getExpressServices = async function () { + return await getExpressDao() +} + +module.exports.addExpressServices = async function (expData) { + //获取的对象需要补充"expressId", "isSigned" + const data = { + expressId: getRandomExpressId(), + isSigned: 0, + ...expData, + } + return await addExpressDao(data) +} + +module.exports.updateExpressServices = async function (expData) { + //这里需要提供id + return await updateExpressDao(expData) +} \ No newline at end of file diff --git a/services/userService.js b/services/userService.js index ba1701f..71e310c 100644 --- a/services/userService.js +++ b/services/userService.js @@ -1,27 +1,47 @@ const md5 = require('md5'); const { - loginDao + loginDao, + updateUserDao, + getUserInfoDao } = require("../dao/userDao") +const jwt = require("jsonwebtoken"); +const { + getJwtToken +} = require('../utils/tools'); module.exports.loginService = async function (loginInfo) { //将明文密码转换为加密密码 loginInfo.loginPwd = md5(loginInfo.loginPwd); let userInfo = await loginDao(loginInfo) if (userInfo) { - userInfo = { - id: userInfo.id, - loginId: userInfo.loginId - } - console.log(userInfo) - + const { + loginPwd, + id, + ...data + } = userInfo.dataValues //添加token后返回 let token = "" - token = "123" + token = getJwtToken(data) return { token, - data: userInfo + data } } return { data: userInfo } +} + +module.exports.updateUserInfoService = async function (userInfo) { + + // userInfo.loginPwd = md5(userInfo.loginPwd) + await updateUserDao(userInfo) + + const result = await getUserInfoDao(userInfo.loginId) + + return result.dataValues +} + +module.exports.getUserInfoService = async function (loginId) { + const data = await getUserInfoDao(loginId) + return data.dataValues } \ No newline at end of file diff --git a/utils/tools.js b/utils/tools.js index 2313c8a..cdee465 100644 --- a/utils/tools.js +++ b/utils/tools.js @@ -1,7 +1,37 @@ +const jwt = require("jsonwebtoken") +const md5 = require("md5") + module.exports.formatResponse = function (code, msg, data) { return { code, msg, data } +} + +module.exports.analysisToken = function (token) { + return jwt.verify(token.split(" ")[1], md5(process.env.JWT_SECRET)) +} + +module.exports.getJwtToken = function (payload) { + let loginPeriod = 1; //默认记住一天 + return jwt.sign(payload, md5(process.env.JWT_SECRET), { + expiresIn: 60 * 60 * 24 * loginPeriod + }) +} + +module.exports.getRandomExpressId = function () { + return "SF" + Math.floor(Math.random() * 1000000000000) +} + +module.exports.handleArrayDaoData = function (arr) { + const result = [] + // for (const item of arr) { + // result.push(item.dataValues) + // } + //倒叙输出 + for (let i = arr.length - 1; i >= 0; i--) { + result.push(arr[i].dataValues) + } + return result } \ No newline at end of file