diff --git a/.gitignore b/.gitignore index 1bd3f40..492dc43 100644 --- a/.gitignore +++ b/.gitignore @@ -1,9 +1,9 @@ .* !.gitignore *.log +dist node_modules __pycache__ package-lock.json -vue-project -ws-server \ No newline at end of file +*-* \ No newline at end of file diff --git a/controllers/api/index.js b/controllers/api/index.js deleted file mode 100644 index 24aecb3..0000000 --- a/controllers/api/index.js +++ /dev/null @@ -1,8 +0,0 @@ -const router = require('express').Router(); - -// 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 d3505ee..392b229 100644 --- a/controllers/files/api.js +++ b/controllers/files/api.js @@ -1,39 +1,11 @@ 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, '../../'); +const getFilePath = require('./index'); // 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); - }); +router.get('/:type/*', (req, res) => { + // console.log(req.params); + const path = getFilePath(`${req.params.type}/${req.params[0]}.${req.query.type}`); + res.sendFile(path); }) module.exports = router; \ No newline at end of file diff --git a/controllers/files/index.js b/controllers/files/index.js new file mode 100644 index 0000000..47f8081 --- /dev/null +++ b/controllers/files/index.js @@ -0,0 +1,24 @@ +const {join} = require('path'); +const fs = require('fs'); +require('dotenv').config(); +const env = process.env; +const root = join(__dirname, '../../'); + +function getFilePath(path) { + return join(root, `${env.FILE_PATH}`, path); +} + +// function getFile(path, callback) { +// const filePath = join(root, `${env.FILE_PATH}`, path); + +// fs.readFile(filePath, (err, data) => { +// if (err) { +// console.error(err); +// // return res.status(500).send('Error reading file'); +// } + +// callback(data); +// }); +// } + +module.exports = getFilePath; \ No newline at end of file diff --git a/default.env b/default.env index c85943b..bbf08d6 100644 --- a/default.env +++ b/default.env @@ -6,4 +6,4 @@ ADMIN_LOGIN_PASSWORD=admin MOD= STATIC_PATH=./static -HOME_PATH=./home \ No newline at end of file +FILE_PATH=./home \ No newline at end of file diff --git a/routes/api.js b/routes/api.js index 7315b84..0634c4f 100644 --- a/routes/api.js +++ b/routes/api.js @@ -2,7 +2,7 @@ const express = require('express'); const router = express.Router(); -router.use(require('../controllers/api/index')); +router.use('/files', require('../controllers/files/api.js')); // router.use('/home') module.exports = router; \ No newline at end of file diff --git a/routes/files.js b/routes/files.js deleted file mode 100644 index 12a8fea..0000000 --- a/routes/files.js +++ /dev/null @@ -1,11 +0,0 @@ -const utils = require('../utils.js'); -const express = require('express'); - -const router = express.Router(); - -router.get('/', function(req, res, next) { - // res.sendFile(utils.path.join(utils.DATA_FILE_PATH, 'index.html')); - res.send('files'); -}); - -module.exports = router; diff --git a/routes/users.js b/routes/users.js deleted file mode 100644 index eafb9c8..0000000 --- a/routes/users.js +++ /dev/null @@ -1,39 +0,0 @@ -const router = require('express').Router(); -const { getRoot, getAdmin, getLogin } = require('../controllers/users/users.js'); - -/* GET users listing. */ -router.get('/', getRoot); -router.get('/admin', getAdmin); -router.get('/login', getLogin); - - -// WILL BE FILLING -router.get('/register', function(req, res, next) { - res.send('respond with a resource'); -}) -router.get('/logout', function(req, res, next) { - res.send('respond with a resource'); -}) -router.get('/profile', function(req, res, next) { - res.send('respond with a resource'); -}) -router.get('/profile/edit', function(req, res, next) { - res.send('respond with a resource'); -}) -router.get('/profile/edit/password', function(req, res, next) { - res.send('respond with a resource'); -}) -router.get('/profile/edit/username', function(req, res, next) { - res.send('respond with a resource'); -}) -router.get('/profile/edit/email', function(req, res, next) { - res.send('respond with a resource'); -}) -router.get('/profile/edit/phone', function(req, res, next) { - res.send('respond with a resource'); -}) -router.get('/profile/edit/website', function(req, res, next) { - res.send('respond with a resource'); -}) - -module.exports = router; diff --git a/server.js b/server.js index 6220180..77e7a7f 100644 --- a/server.js +++ b/server.js @@ -9,7 +9,7 @@ app.use(express.json()); app.use(express.urlencoded({ extended: false })); app.use(require('cookie-parser')()); -dist = path.join(__dirname, 'vue-project', 'dist') +dist = path.join(__dirname, env.STATIC_PATH ?? 'static') // 静态资源服务，假设你的dist目录包含了编译后的Vue应用 app.use(express.static(dist)); diff --git a/start.py b/start.py deleted file mode 100644 index fdcdfbf..0000000 --- a/start.py +++ /dev/null @@ -1,32 +0,0 @@ -import subprocess - -def run_command(command): - """Run a shell command.""" - try: - subprocess.run(command, check=True, shell=True) - except subprocess.CalledProcessError as e: - print(f"Error executing command: {command}") - print(e) - exit(1) - -def main(): - # Define the commands you want to run - commands = [ - # 'git clone https://github.com/yourusername/yourproject.git', - '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' - 'npm start' - ] - - # Run each command in sequence - for cmd in commands: - print(f"Executing: {cmd}") - run_command(cmd) - -if __name__ == '__main__': - main() \ No newline at end of file