Merge branch 'feature/mzl-dev'
This commit is contained in:
root
+85
-86
@@ -5,8 +5,8 @@
|
||||
| 项目 | 值 |
|
||||
|------|-----|
|
||||
| **域名** | uniservice-mobile.hnxinyouhe.com |
|
||||
| **前端目录** | /www/sites/uniservice-mobile.hnxinyouhe.com/index |
|
||||
| **后端目录** | /opt/x-server-mobile |
|
||||
| **站点目录** | /opt/1panel/www/sites/uniservice-mobile.hnxinyouhe.com/index |
|
||||
| **项目目录** | /opt/1panel/www/sites/uniservice-mobile.hnxinyouhe.com/index/server |
|
||||
| **后端容器** | x-server-backend-prod (端口 8787) |
|
||||
| **MySQL 容器** | 1Panel-mysql-XyxS |
|
||||
| **Redis 容器** | 1Panel-redis-pxdb |
|
||||
@@ -23,30 +23,32 @@
|
||||
|
||||
---
|
||||
|
||||
## 快速部署
|
||||
## 目录结构
|
||||
|
||||
### 方式一：自动部署脚本（推荐）
|
||||
|
||||
**本地执行**（前端+后端一起部署）：
|
||||
|
||||
```bash
|
||||
# 1. 本地构建前端
|
||||
cd /www/x-server-mobile/frontend
|
||||
npm run build
|
||||
|
||||
# 2. 执行部署脚本
|
||||
cd ..
|
||||
./deploy/deploy-1panel.sh your-server-ip
|
||||
```
|
||||
/opt/1panel/www/sites/uniservice-mobile.hnxinyouhe.com/index/
|
||||
├── index.html # 前端入口
|
||||
├── assets/ # 前端静态资源
|
||||
└── server/ # 整个项目（Git 仓库）
|
||||
├── backend/ # 后端代码
|
||||
│ ├── app/
|
||||
│ ├── config/
|
||||
│ └── ...
|
||||
├── deploy/ # 部署配置
|
||||
│ ├── docker-compose.prod.yml
|
||||
│ ├── .env.production
|
||||
│ └── deploy.sh
|
||||
├── frontend/ # 前端源码（不使用）
|
||||
├── docs/ # 文档
|
||||
└── logs/ # 日志
|
||||
└── backend/
|
||||
```
|
||||
|
||||
脚本会自动：
|
||||
- 上传前端静态文件到 1Panel 静态站点
|
||||
- 上传后端代码到服务器
|
||||
- 重启后端 Docker 容器
|
||||
---
|
||||
|
||||
### 方式二：手动部署
|
||||
## 快速部署
|
||||
|
||||
#### 前端部署（本地）
|
||||
### 前端部署（本地）
|
||||
|
||||
```bash
|
||||
# 本地构建
|
||||
@@ -56,75 +58,59 @@ npm run build
|
||||
# 上传静态文件
|
||||
rsync -avz --delete \
|
||||
frontend/dist/ \
|
||||
root@your-server:/www/sites/uniservice-mobile.hnxinyouhe.com/index/
|
||||
root@45.153.130.80:/opt/1panel/www/sites/uniservice-mobile.hnxinyouhe.com/index/
|
||||
```
|
||||
|
||||
#### 后端部署（服务器）
|
||||
### 后端部署（服务器）
|
||||
|
||||
```bash
|
||||
# 登录服务器
|
||||
ssh root@your-server
|
||||
cd /opt/x-server-mobile
|
||||
ssh root@45.153.130.80
|
||||
cd /opt/1panel/www/sites/uniservice-mobile.hnxinyouhe.com/index/server
|
||||
|
||||
# 拉取代码
|
||||
git pull
|
||||
git pull origin master
|
||||
|
||||
# 重启容器
|
||||
docker-compose -f docker-compose.prod.yml down
|
||||
docker-compose -f docker-compose.prod.yml up -d
|
||||
docker-compose -f deploy/docker-compose.prod.yml down
|
||||
docker-compose -f deploy/docker-compose.prod.yml up -d
|
||||
```
|
||||
|
||||
---
|
||||
|
||||
## 服务器端部署脚本
|
||||
|
||||
在服务器上创建 `/opt/x-server-mobile/deploy.sh`：
|
||||
|
||||
或使用部署脚本：
|
||||
```bash
|
||||
#!/bin/bash
|
||||
cd /opt/x-server-mobile
|
||||
git pull
|
||||
docker-compose -f docker-compose.prod.yml down
|
||||
docker-compose -f docker-compose.prod.yml up -d
|
||||
docker ps | grep x-server
|
||||
```
|
||||
|
||||
使用：
|
||||
|
||||
```bash
|
||||
ssh root@your-server
|
||||
cd /opt/x-server-mobile
|
||||
chmod +x deploy.sh
|
||||
./deploy.sh
|
||||
ssh root@45.153.130.80
|
||||
cd /opt/1panel/www/sites/uniservice-mobile.hnxinyouhe.com/index/server
|
||||
./deploy/deploy.sh
|
||||
```
|
||||
|
||||
---
|
||||
|
||||
## 首次部署
|
||||
|
||||
### 1. 服务器准备
|
||||
### 1. 克隆后端代码
|
||||
|
||||
```bash
|
||||
ssh root@your-server
|
||||
ssh root@45.153.130.80
|
||||
cd /opt/1panel/www/sites/uniservice-mobile.hnxinyouhe.com/index
|
||||
|
||||
# 创建项目目录
|
||||
mkdir -p /opt/x-server-mobile
|
||||
cd /opt/x-server-mobile
|
||||
|
||||
# 克隆代码
|
||||
git clone <your-git-repository-url> .
|
||||
|
||||
# 上传部署配置
|
||||
# （在本地执行）
|
||||
scp deploy/docker-compose.prod.yml root@your-server:/opt/x-server-mobile/
|
||||
scp deploy/.env.production root@your-server:/opt/x-server-mobile/
|
||||
# 克隆 master 分支
|
||||
git clone <your-git-repository-url> server
|
||||
cd server
|
||||
git checkout master
|
||||
```
|
||||
|
||||
### 2. 配置环境变量
|
||||
### 2. 上传 Dockerfile
|
||||
|
||||
```bash
|
||||
ssh root@your-server
|
||||
vi /opt/x-server-mobile/.env.production
|
||||
# 本地执行
|
||||
scp backend/Dockerfile.prod root@45.153.130.80:/opt/1panel/www/sites/uniservice-mobile.hnxinyouhe.com/index/server/backend/
|
||||
```
|
||||
|
||||
### 3. 配置环境变量
|
||||
|
||||
```bash
|
||||
ssh root@45.153.130.80
|
||||
vi /opt/1panel/www/sites/uniservice-mobile.hnxinyouhe.com/index/server/deploy/.env.production
|
||||
```
|
||||
|
||||
填写飞书配置：
|
||||
@@ -136,29 +122,41 @@ FEISHU_ENCRYPT_KEY=xxxxxxxxxxxxxxxxxxxx
|
||||
FEISHU_VERIFICATION_TOKEN=xxxxxxxxxxxxxxxxxxxx
|
||||
```
|
||||
|
||||
### 3. 启动后端容器
|
||||
### 4. 创建日志目录
|
||||
|
||||
```bash
|
||||
ssh root@your-server
|
||||
cd /opt/x-server-mobile
|
||||
docker-compose -f docker-compose.prod.yml up -d
|
||||
ssh root@45.153.130.80
|
||||
mkdir -p /opt/1panel/www/sites/uniservice-mobile.hnxinyouhe.com/index/server/logs/backend
|
||||
```
|
||||
|
||||
### 5. 上传部署脚本
|
||||
|
||||
```bash
|
||||
# 本地执行
|
||||
scp deploy/server-deploy.sh root@45.153.130.80:/opt/1panel/www/sites/uniservice-mobile.hnxinyouhe.com/index/server/deploy/deploy.sh
|
||||
|
||||
# 赋予执行权限
|
||||
ssh root@45.153.130.80
|
||||
chmod +x /opt/1panel/www/sites/uniservice-mobile.hnxinyouhe.com/index/server/deploy/deploy.sh
|
||||
```
|
||||
|
||||
### 6. 启动后端容器
|
||||
|
||||
```bash
|
||||
ssh root@45.153.130.80
|
||||
cd /opt/1panel/www/sites/uniservice-mobile.hnxinyouhe.com/index/server
|
||||
docker-compose -f deploy/docker-compose.prod.yml up -d
|
||||
docker ps | grep x-server
|
||||
```
|
||||
|
||||
### 4. 配置 1Panel 静态站点
|
||||
|
||||
1. 在 1Panel 面板创建静态网站
|
||||
2. 根目录: `/www/sites/uniservice-mobile.hnxinyouhe.com/index`
|
||||
3. 添加 Nginx 反向代理（见下方配置）
|
||||
|
||||
### 5. 上传前端
|
||||
### 7. 上传前端
|
||||
|
||||
```bash
|
||||
cd /www/x-server-mobile/frontend
|
||||
npm run build
|
||||
rsync -avz --delete \
|
||||
frontend/dist/ \
|
||||
root@your-server:/www/sites/uniservice-mobile.hnxinyouhe.com/index/
|
||||
root@45.153.130.80:/opt/1panel/www/sites/uniservice-mobile.hnxinyouhe.com/index/
|
||||
```
|
||||
|
||||
---
|
||||
@@ -226,7 +224,7 @@ location /feishu/card/callback {
|
||||
curl -I https://uniservice-mobile.hnxinyouhe.com
|
||||
|
||||
# 检查后端容器
|
||||
ssh root@your-server
|
||||
ssh root@45.153.130.80
|
||||
docker ps | grep x-server
|
||||
docker logs -f x-server-backend-prod
|
||||
```
|
||||
@@ -239,17 +237,18 @@ docker logs -f x-server-backend-prod
|
||||
|------|---------|
|
||||
| API 404 | 检查 Nginx 反向代理配置 |
|
||||
| 容器启动失败 | 检查数据库/Redis 容器状态，查看日志 |
|
||||
| 飙书登录失败 | 检查 `/login/*` 反向代理配置 |
|
||||
| 飞书登录失败 | 检查 `/login/*` 反向代理配置 |
|
||||
| 静态资源 404 | 确认前端上传到正确目录 |
|
||||
|
||||
---
|
||||
|
||||
## 文件清单
|
||||
|
||||
| 文件 | 用途 |
|
||||
|------|------|
|
||||
| `deploy/docker-compose.prod.yml` | 生产环境 Docker Compose |
|
||||
| `deploy/.env.production` | 生产环境变量 |
|
||||
| `deploy/nginx-1panel.conf` | Nginx 配置参考 |
|
||||
| `deploy/deploy-1panel.sh` | 本端部署脚本 |
|
||||
| `deploy/server-deploy.sh` | 服务器端部署脚本 |
|
||||
需要上传到服务器的文件：
|
||||
|
||||
| 文件 | 目标位置 |
|
||||
|------|---------|
|
||||
| `backend/Dockerfile.prod` | `server/backend/` |
|
||||
| `deploy/docker-compose.prod.yml` | `server/deploy/` |
|
||||
| `deploy/.env.production` | `server/deploy/` |
|
||||
| `deploy/server-deploy.sh` | `server/deploy/deploy.sh` |
|
||||
|
||||
Reference in New Issue
Block a user