From 87c34179fa124ecb77dee453349267120fd1fd4d Mon Sep 17 00:00:00 2001 From: xujiang Date: Wed, 9 Jul 2025 10:44:42 +0800 Subject: [PATCH] =?UTF-8?q?refactor:=20=E6=B8=85=E7=90=86=E6=A0=B9?= =?UTF-8?q?=E7=9B=AE=E5=BD=95=E7=BB=93=E6=9E=84=EF=BC=8C=E9=87=8D=E7=BB=84?= =?UTF-8?q?=E9=83=A8=E7=BD=B2=E6=96=87=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 移动文件： - Caddyfile → docs/deployment/Caddyfile - fix-caddy-permissions.sh → docs/deployment/fix-caddy-permissions.sh 删除无用文件： - 根目录 package.json (空项目文件) - 根目录 bun.lock (无用锁定文件) - 根目录 node_modules/ (无用依赖目录) 保留文件： - lint-staged.config.js (项目级 pre-commit 配置) 更新引用： - 更新 caddy-setup.md 中的文件路径 - 更新 deployment/README.md 文档结构 现在根目录更干净，部署相关文件统一在 docs/deployment/ 目录下 --- bun.lock | 16 ------- Caddyfile => docs/deployment/Caddyfile | 0 docs/deployment/README.md | 42 ++++++++++++++----- docs/deployment/caddy-setup.md | 4 +- .../deployment/fix-caddy-permissions.sh | 0 package.json | 7 ---- 6 files changed, 34 insertions(+), 35 deletions(-) delete mode 100644 bun.lock rename Caddyfile => docs/deployment/Caddyfile (100%) rename fix-caddy-permissions.sh => docs/deployment/fix-caddy-permissions.sh (100%) delete mode 100644 package.json diff --git a/bun.lock b/bun.lock deleted file mode 100644 index 0e72e8e..0000000 --- a/bun.lock +++ /dev/null @@ -1,16 +0,0 @@ -{ - "lockfileVersion": 1, - "workspaces": { - "": { - "devDependencies": { - "prettier": "^3.6.2", - "prettier-plugin-tailwindcss": "^0.6.13", - }, - }, - }, - "packages": { - "prettier": ["prettier@3.6.2", "", { "bin": { "prettier": "bin/prettier.cjs" } }, "sha512-I7AIg5boAr5R0FFtJ6rCfD+LFsWHp81dolrFD8S79U9tb8Az2nGrJncnMSnys+bpQJfRUzqs9hnA81OAA3hCuQ=="], - - "prettier-plugin-tailwindcss": ["prettier-plugin-tailwindcss@0.6.13", "", { "peerDependencies": { "@ianvs/prettier-plugin-sort-imports": "*", "@prettier/plugin-pug": "*", "@shopify/prettier-plugin-liquid": "*", "@trivago/prettier-plugin-sort-imports": "*", "@zackad/prettier-plugin-twig": "*", "prettier": "^3.0", "prettier-plugin-astro": "*", "prettier-plugin-css-order": "*", "prettier-plugin-import-sort": "*", "prettier-plugin-jsdoc": "*", "prettier-plugin-marko": "*", "prettier-plugin-multiline-arrays": "*", "prettier-plugin-organize-attributes": "*", "prettier-plugin-organize-imports": "*", "prettier-plugin-sort-imports": "*", "prettier-plugin-style-order": "*", "prettier-plugin-svelte": "*" }, "optionalPeers": ["@ianvs/prettier-plugin-sort-imports", "@prettier/plugin-pug", "@shopify/prettier-plugin-liquid", "@trivago/prettier-plugin-sort-imports", "@zackad/prettier-plugin-twig", "prettier-plugin-astro", "prettier-plugin-css-order", "prettier-plugin-import-sort", "prettier-plugin-jsdoc", "prettier-plugin-marko", "prettier-plugin-multiline-arrays", "prettier-plugin-organize-attributes", "prettier-plugin-organize-imports", "prettier-plugin-sort-imports", "prettier-plugin-style-order", "prettier-plugin-svelte"] }, "sha512-uQ0asli1+ic8xrrSmIOaElDu0FacR4x69GynTh2oZjFY10JUt6EEumTQl5tB4fMeD6I1naKd+4rXQQ7esT2i1g=="], - } -} diff --git a/Caddyfile b/docs/deployment/Caddyfile similarity index 100% rename from Caddyfile rename to docs/deployment/Caddyfile diff --git a/docs/deployment/README.md b/docs/deployment/README.md index 6b64304..0b7fc90 100644 --- a/docs/deployment/README.md +++ b/docs/deployment/README.md @@ -4,12 +4,15 @@ ## 目录结构 -- `environments.md` - 环境配置说明 -- `vercel-deployment.md` - Vercel 部署指南 -- `docker-deployment.md` - Docker 部署指南 -- `ci-cd.md` - CI/CD 配置说明 -- `monitoring.md` - 监控和日志配置 -- `backup.md` - 备份策略 +- `caddy-setup.md` - Caddy Web 服务器配置指南 +- `Caddyfile` - Caddy 配置文件 +- `fix-caddy-permissions.sh` - Caddy 权限修复脚本 +- `environments.md` - 环境配置说明（计划中） +- `vercel-deployment.md` - Vercel 部署指南（计划中） +- `docker-deployment.md` - Docker 部署指南（计划中） +- `ci-cd.md` - CI/CD 配置说明（计划中） +- `monitoring.md` - 监控和日志配置（计划中） +- `backup.md` - 备份策略（计划中） ## 部署准备 @@ -28,9 +31,28 @@ NEXT_PUBLIC_API_URL=your-api-url ``` +## 当前部署方案 + +### Caddy + Static Files +- **前端**: 静态文件部署到 `~/www/photography/` +- **Web 服务器**: Caddy (自动 HTTPS) +- **域名**: https://photography.iriver.top +- **CI/CD**: Gitea Actions 自动部署 + +### 快速部署命令 +```bash +# 1. 推送代码触发自动部署 +git push origin main + +# 2. 配置 Web 服务器（仅首次） +scp docs/deployment/Caddyfile user@server:/etc/caddy/Caddyfile +scp docs/deployment/fix-caddy-permissions.sh user@server:~/ +ssh user@server './fix-caddy-permissions.sh && sudo systemctl reload caddy' +``` + ## 支持的部署平台 -- Vercel (推荐) -- Netlify -- Docker -- 传统服务器部署 \ No newline at end of file +- ✅ **Caddy + Static Files** (当前使用) +- 📋 Vercel (计划中) +- 📋 Netlify (计划中) +- 📋 Docker (计划中) \ No newline at end of file diff --git a/docs/deployment/caddy-setup.md b/docs/deployment/caddy-setup.md index 59c654c..4f571d3 100644 --- a/docs/deployment/caddy-setup.md +++ b/docs/deployment/caddy-setup.md @@ -14,13 +14,13 @@ ### 1. 上传配置文件 ```bash # 将 Caddyfile 上传到服务器 -scp Caddyfile user@server:/etc/caddy/Caddyfile +scp docs/deployment/Caddyfile user@server:/etc/caddy/Caddyfile ``` ### 2. 修复权限问题 ```bash # 上传权限修复脚本 -scp fix-caddy-permissions.sh user@server:~/ +scp docs/deployment/fix-caddy-permissions.sh user@server:~/ ssh user@server 'chmod +x fix-caddy-permissions.sh && ./fix-caddy-permissions.sh' ``` diff --git a/fix-caddy-permissions.sh b/docs/deployment/fix-caddy-permissions.sh similarity index 100% rename from fix-caddy-permissions.sh rename to docs/deployment/fix-caddy-permissions.sh diff --git a/package.json b/package.json deleted file mode 100644 index 82cbec2..0000000 --- a/package.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "dependencies": {}, - "devDependencies": { - "prettier": "^3.6.2", - "prettier-plugin-tailwindcss": "^0.6.13" - } -} \ No newline at end of file