diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..639a0c7 --- /dev/null +++ b/.gitignore @@ -0,0 +1,6 @@ +node_modules/ +data/ +uploads/ +logs/ +*.db +.DS_Store diff --git a/data/sqlite.db b/data/sqlite.db deleted file mode 100644 index 5b1ff59..0000000 Binary files a/data/sqlite.db and /dev/null differ diff --git a/deploy.sh b/deploy.sh index 4f3758f..979740d 100755 --- a/deploy.sh +++ b/deploy.sh @@ -107,9 +107,8 @@ start_server() { echo "=========================================" echo "" echo "访问地址:" - echo " 首页: http://localhost:3000" - echo " 登录: http://localhost:3000/login" - echo " 后台: http://localhost:3000/admin" + echo " 首页: http://localhost:80" + echo " 后台: http://localhost:16888" echo "" echo "默认账号: admin / admin123" echo "" diff --git a/public/index.html b/public/index.html index af86529..7d41efa 100644 --- a/public/index.html +++ b/public/index.html @@ -7,7 +7,7 @@ @@ -74,60 +75,77 @@ 首页
+
暂无图片
+
- \ No newline at end of file + diff --git a/public/js/login.js b/public/js/login.js index 3b6b973..64462e6 100644 --- a/public/js/login.js +++ b/public/js/login.js @@ -21,7 +21,7 @@ document.addEventListener('DOMContentLoaded', function() { if (data.success) { localStorage.setItem('token', data.token); - window.location.href = '/admin'; + window.location.href = '/'; } else { errorDiv.textContent = data.error; errorDiv.style.display = 'block'; diff --git a/server.js b/server.js index 596d061..645b685 100644 --- a/server.js +++ b/server.js @@ -202,9 +202,15 @@ wss.on('connection', (ws) => { const adminApp = express(); adminApp.use(express.json()); adminApp.use(express.urlencoded({ extended: true })); -adminApp.use(express.static(path.join(__dirname, 'public'))); adminApp.use('/uploads', express.static(path.join(__dirname, 'uploads'))); +// 路由 - 后台直接在根路径,未登录跳转登录页 +adminApp.get('/login', (req, res) => res.sendFile(path.join(__dirname, 'public', 'login.html'))); +adminApp.get('/', (req, res) => res.sendFile(path.join(__dirname, 'public', 'admin.html'))); + +// 静态文件(不自动serve index.html) +adminApp.use(express.static(path.join(__dirname, 'public'), { index: false })); + const authMiddleware = (req, res, next) => { const token = req.headers.authorization?.split(' ')[1]; if (!token || token !== 'admin-token') return res.status(401).json({ error: '未授权' }); diff --git a/start.sh b/start.sh index ac899a1..8ed656b 100755 --- a/start.sh +++ b/start.sh @@ -1,13 +1,9 @@ #!/bin/bash -# 后台启动脚本 - cd "$(dirname "$0")" -# 创建必要目录 mkdir -p data uploads logs -# 停止已运行的进程 if [ -f server.pid ]; then PID=$(cat server.pid) if ps -p $PID > /dev/null 2>&1; then @@ -18,20 +14,22 @@ if [ -f server.pid ]; then rm -f server.pid fi -# 启动服务 echo "启动服务器..." nohup node server.js > logs/server.log 2>&1 & echo $! > server.pid +sleep 1 + +HOST=$(hostname -I 2>/dev/null | awk '{print $1}' || echo "localhost") + echo "" echo "=========================================" echo " 服务器已启动" echo "=========================================" echo "" echo "访问地址:" -echo " 首页: http://38.55.107.61:3000" -echo " 登录: http://38.55.107.61:3000/login" -echo " 后台: http://38.55.107.61:3000/admin" +echo " 首页: http://${HOST}:80" +echo " 后台: http://${HOST}:16888" echo "" echo "默认账号: admin / admin123" echo ""