From a891912817e907f634dd18d8e781782f39c5c82f Mon Sep 17 00:00:00 2001 From: ZZY <2450266535@qq.com> Date: Sat, 3 Aug 2024 12:40:58 +0800 Subject: [PATCH] bugfix --- controllers/api/index.js | 6 ++++-- controllers/files/api.js | 35 ++++++++++++++++++++++++++++++++++- default.env | 6 +++++- start.py | 9 ++++----- 4 files changed, 47 insertions(+), 9 deletions(-) diff --git a/controllers/api/index.js b/controllers/api/index.js index bb9685b..24aecb3 100644 --- a/controllers/api/index.js +++ b/controllers/api/index.js @@ -1,6 +1,8 @@ const router = require('express').Router(); -router.use('/users', require('../users/api.js')); -router.use('/files', require('../files/api.js')); +// router.use('/users', require('../users/api.js')); +// router.use('/files', require('../files/api.js')); + +router.use('/files', require('../files/api.js')) module.exports = router; \ No newline at end of file diff --git a/controllers/files/api.js b/controllers/files/api.js index 923fc23..d3505ee 100644 --- a/controllers/files/api.js +++ b/controllers/files/api.js @@ -1,6 +1,39 @@ const router = require('express').Router(); const { getJsonFile } = require('./json'); +const {join} = require('path'); +const fs = require('fs'); +require('dotenv').config(); +const env = process.env; +const root = join(__dirname, '../../'); -router.get('/json/:filename', getJsonFile); +// router.get('/json/:filename', getJsonFile); +router.get('/cards/:filename', (req, res) => { + + const filePath = join(root, `${env.FILE_PATH}/cards/${req.params.filename}.${req.query.type}`); + + fs.readFile(filePath, (err, data) => { + if (err) { + console.error(err); + return res.status(500).send('Error reading file'); + } + + res.setHeader('Content-Type', 'application/json'); + res.send(data); + }); +}) + +router.get('/notes/:filename', (req, res) => { + const filePath = join(root, `${env.FILE_PATH}/notes/${req.params.filename}.${req.query.type}`); + + fs.readFile(filePath, (err, data) => { + if (err) { + console.error(err); + return res.status(500).send('Error reading file'); + } + + res.setHeader('Content-Type', 'text/html'); + res.send(data); + }); +}) module.exports = router; \ No newline at end of file diff --git a/default.env b/default.env index 6f92e8e..c85943b 100644 --- a/default.env +++ b/default.env @@ -2,4 +2,8 @@ LISTEN_PORT=3000 JWT_SECRET=123456 DATABASE_NAME=sqlite3.db ADMIN_LOGIN_NAME=admin -ADMIN_LOGIN_PASSWORD=admin \ No newline at end of file +ADMIN_LOGIN_PASSWORD=admin + +MOD= +STATIC_PATH=./static +HOME_PATH=./home \ No newline at end of file diff --git a/start.py b/start.py index d361eeb..fdcdfbf 100644 --- a/start.py +++ b/start.py @@ -13,11 +13,10 @@ def main(): # Define the commands you want to run commands = [ # 'git clone https://github.com/yourusername/yourproject.git', - 'cd vue-project', - 'git pull', - 'npm install', - 'npm run build', - 'cd ..', + 'cd vue-project && git pull', + 'cd vue-project && npm install', + 'cd vue-project && npm run build', + 'git pull', 'npm install', 'cp -r vue-project/dist/* ./dist'