From 3a99eec597d6d1b1d6a8dae3ea2a21a3ac88e3b3 Mon Sep 17 00:00:00 2001
From: hanshiyang <yg_yl@163.com>
Date: Tue, 27 Jan 2026 15:19:07 +0800
Subject: [PATCH] =?UTF-8?q?chore:=20=E6=9B=B4=E6=96=B0=E9=A1=B9=E7=9B=AE?=
 =?UTF-8?q?=E9=85=8D=E7=BD=AE=E4=B8=8EDocker=E7=BC=96=E6=8E=92?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 将前端构建命令中的 `vue-tsc` 移除，仅保留 `vite build`
- 在 .gitignore 中添加 frontend/dist 目录
- 调整 Docker Compose 网络子网和容器端口映射
- 注释掉前端服务容器定义，便于本地开发
---
 .gitignore            |  1 +
 docker-compose.yml    | 42 +++++++++++++++++++++---------------------
 frontend/package.json |  2 +-
 3 files changed, 23 insertions(+), 22 deletions(-)

diff --git a/.gitignore b/.gitignore
index 8d11d0c..f560d2f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,6 @@
 /.idea/
 /backend/target/
+/frontend/dist/
 /frontend/node_modules/
 /frontend/node_modules/*
 /KEY_GENERATOR.md
diff --git a/docker-compose.yml b/docker-compose.yml
index 0d63293..ec78fae 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -5,7 +5,7 @@ networks:
     driver: bridge
     ipam:
       config:
-      - subnet: 192.168.100.0/24
+      - subnet: 192.168.255.0/24
 
 services:
   # MySQL 数据库
@@ -18,7 +18,7 @@ services:
       MYSQL_DATABASE: crm_db
       TZ: Asia/Shanghai
     ports:
-      - "3306:3306"
+      - "39948:3306"
     volumes:
       - ./mysql/data:/var/lib/mysql
       - ./sql/init.sql:/docker-entrypoint-initdb.d/init.sql:ro
@@ -55,7 +55,7 @@ services:
       SERVER_PORT: 8080
       TZ: Asia/Shanghai
     ports:
-      - "8080:8080"
+      - "9948:8080"
     volumes:
       - ./backend/logs:/app/logs
     networks:
@@ -67,21 +67,21 @@ services:
       retries: 3
       start_period: 60s
 
-  # 前端服务（Nginx）
-  crm-frontend:
-    build:
-      context: ./frontend
-      dockerfile: Dockerfile
-    container_name: crm-frontend
-    restart: always
-    depends_on:
-      - crm-backend
-    ports:
-      - "80:80"
-    networks:
-      - crm_network
-    healthcheck:
-      test: ["CMD", "wget", "--quiet", "--tries=1", "--spider", "http://localhost:80"]
-      interval: 30s
-      timeout: 5s
-      retries: 3
+  # # 前端服务（Nginx）
+  # crm-frontend:
+  #   build:
+  #     context: ./frontend
+  #     dockerfile: Dockerfile
+  #   container_name: crm-frontend
+  #   restart: always
+  #   depends_on:
+  #     - crm-backend
+  #   ports:
+  #     - "9948:80"
+  #   networks:
+  #     - crm_network
+  #   healthcheck:
+  #     test: ["CMD", "wget", "--quiet", "--tries=1", "--spider", "http://localhost:80"]
+  #     interval: 30s
+  #     timeout: 5s
+  #     retries: 3
diff --git a/frontend/package.json b/frontend/package.json
index 34eb543..9215ba6 100644
--- a/frontend/package.json
+++ b/frontend/package.json
@@ -5,7 +5,7 @@
   "type": "module",
   "scripts": {
     "dev": "vite",
-    "build": "vue-tsc && vite build",
+    "build": "vite build",
     "preview": "vite preview",
     "lint": "eslint . --ext .vue,.js,.jsx,.cjs,.mjs,.ts,.tsx,.cts,.mts --fix --ignore-path .gitignore"
   },