feat: 更新部署配置适应新的目录结构
- 后端代码在 server/ 目录(Git 仓库)
- docker-compose 在 deploy/ 目录
- 部署脚本路径更新
- 部署文档更新
目录结构:
/opt/1panel/www/sites/uniservice-mobile.hnxinyouhe.com/index/
├── index.html # 前端入口
├── assets/ # 前端静态资源
└── server/ # 整个项目(Git)
├── backend/
├── deploy/
└── logs/
Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
This commit is contained in:
@@ -1,11 +1,12 @@
|
||||
# X-Server Mobile 生产环境 Docker Compose
|
||||
# 使用方法: docker-compose -f deploy/docker-compose.prod.yml up -d
|
||||
# 位置: server/deploy/docker-compose.prod.yml
|
||||
# 项目根目录执行: docker-compose -f deploy/docker-compose.prod.yml up -d
|
||||
|
||||
services:
|
||||
# PHP 后端服务
|
||||
backend:
|
||||
build:
|
||||
context: ./backend
|
||||
context: ../backend
|
||||
dockerfile: Dockerfile.prod
|
||||
container_name: x-server-backend-prod
|
||||
restart: unless-stopped
|
||||
@@ -28,15 +29,15 @@ services:
|
||||
- REDIS_PORT=6379
|
||||
- REDIS_PASSWORD=redis_FTzdM6
|
||||
|
||||
# 飞书配置(请替换为实际值)
|
||||
# 飞书配置(从 .env.production 读取)
|
||||
- FEISHU_APP_ID=${FEISHU_APP_ID}
|
||||
- FEISHU_APP_SECRET=${FEISHU_APP_SECRET}
|
||||
- FEISHU_ENCRYPT_KEY=${FEISHU_ENCRYPT_KEY}
|
||||
- FEISHU_VERIFICATION_TOKEN=${FEISHU_VERIFICATION_TOKEN}
|
||||
- FEISHU_TENANT_KEY=${FEISHU_TENANT_KEY:-14e7bc0fe5985740}
|
||||
volumes:
|
||||
- ./backend:/app
|
||||
- ./logs/backend:/app/runtime/logs
|
||||
- ../backend:/app
|
||||
- ../logs/backend:/app/runtime/logs
|
||||
networks:
|
||||
- 1panel-network
|
||||
healthcheck:
|
||||
|
||||
+14
-13
@@ -1,6 +1,7 @@
|
||||
#!/bin/bash
|
||||
# X-Server Mobile 后端部署脚本(服务器端)
|
||||
# 使用方法: cd /opt/x-server-mobile && ./deploy.sh
|
||||
# 位置: server/deploy.sh
|
||||
# 使用方法: ./deploy.sh
|
||||
|
||||
set -e
|
||||
|
||||
@@ -27,8 +28,8 @@ log_step() {
|
||||
echo -e "${BLUE}==>${NC} $1"
|
||||
}
|
||||
|
||||
# 项目目录
|
||||
PROJECT_DIR="/opt/x-server-mobile"
|
||||
# 项目目录(server 目录)
|
||||
PROJECT_DIR="/opt/1panel/www/sites/uniservice-mobile.hnxinyouhe.com/index/server"
|
||||
cd "$PROJECT_DIR"
|
||||
|
||||
echo "=========================================="
|
||||
@@ -43,12 +44,7 @@ echo ""
|
||||
# ============================================
|
||||
log_step "拉取最新代码..."
|
||||
|
||||
# 获取当前分支名
|
||||
CURRENT_BRANCH=$(git rev-parse --abbrev-ref HEAD)
|
||||
|
||||
# 拉取最新代码
|
||||
git fetch origin
|
||||
git reset --hard "origin/${CURRENT_BRANCH}"
|
||||
git pull origin master
|
||||
|
||||
log_info "代码已更新"
|
||||
|
||||
@@ -57,14 +53,19 @@ log_info "代码已更新"
|
||||
# ============================================
|
||||
log_step "重启后端容器..."
|
||||
|
||||
if [ ! -f "docker-compose.prod.yml" ]; then
|
||||
log_error "docker-compose.prod.yml 不存在"
|
||||
if [ ! -f "deploy/docker-compose.prod.yml" ]; then
|
||||
log_error "deploy/docker-compose.prod.yml 不存在"
|
||||
exit 1
|
||||
fi
|
||||
|
||||
# 加载环境变量
|
||||
if [ -f "deploy/.env.production" ]; then
|
||||
export $(cat deploy/.env.production | grep -v '^#' | xargs)
|
||||
fi
|
||||
|
||||
# 重启容器
|
||||
docker-compose -f docker-compose.prod.yml down 2>/dev/null || true
|
||||
docker-compose -f docker-compose.prod.yml up -d
|
||||
docker-compose -f deploy/docker-compose.prod.yml down 2>/dev/null || true
|
||||
docker-compose -f deploy/docker-compose.prod.yml up -d
|
||||
|
||||
log_info "后端容器已重启"
|
||||
|
||||
|
||||
Reference in New Issue
Block a user