Compare commits

..

No commits in common. "264788b54c8214819deddfd8965b01c8c9e080c2" and "afb65d685ad871bf0f2e2a26364cc2956d495766" have entirely different histories.

3 changed files with 22 additions and 23 deletions

1
.gitignore vendored
View File

@ -1,6 +1,5 @@
/.idea/ /.idea/
/backend/target/ /backend/target/
/frontend/dist/
/frontend/node_modules/ /frontend/node_modules/
/frontend/node_modules/* /frontend/node_modules/*
/KEY_GENERATOR.md /KEY_GENERATOR.md

View File

@ -5,7 +5,7 @@ networks:
driver: bridge driver: bridge
ipam: ipam:
config: config:
- subnet: 192.168.255.0/24 - subnet: 192.168.100.0/24
services: services:
# MySQL 数据库 # MySQL 数据库
@ -22,7 +22,7 @@ services:
'--collation-server=utf8mb4_unicode_ci', '--collation-server=utf8mb4_unicode_ci',
] ]
ports: ports:
- "39948:3306" - "3307:3306"
volumes: volumes:
- ./mysql/data:/var/lib/mysql - ./mysql/data:/var/lib/mysql
- ./sql:/docker-entrypoint-initdb.d:ro - ./sql:/docker-entrypoint-initdb.d:ro
@ -59,7 +59,7 @@ services:
SERVER_PORT: 8080 SERVER_PORT: 8080
TZ: Asia/Shanghai TZ: Asia/Shanghai
ports: ports:
- "9948:8080" - "8080:8080"
volumes: volumes:
- ./backend/logs:/app/logs - ./backend/logs:/app/logs
networks: networks:
@ -71,21 +71,21 @@ services:
retries: 3 retries: 3
start_period: 60s start_period: 60s
# # 前端服务Nginx # 前端服务Nginx
# crm-frontend: crm-frontend:
# build: build:
# context: ./frontend context: ./frontend
# dockerfile: Dockerfile dockerfile: Dockerfile
# container_name: crm-frontend container_name: crm-frontend
# restart: always restart: always
# depends_on: depends_on:
# - crm-backend - crm-backend
# ports: ports:
# - "9948:80" - "80:80"
# networks: networks:
# - crm_network - crm_network
# healthcheck: healthcheck:
# test: ["CMD", "wget", "--quiet", "--tries=1", "--spider", "http://localhost:80"] test: ["CMD", "wget", "--quiet", "--tries=1", "--spider", "http://localhost:80"]
# interval: 30s interval: 30s
# timeout: 5s timeout: 5s
# retries: 3 retries: 3

View File

@ -5,7 +5,7 @@
"type": "module", "type": "module",
"scripts": { "scripts": {
"dev": "vite", "dev": "vite",
"build": "vite build", "build": "vue-tsc && vite build",
"preview": "vite preview", "preview": "vite preview",
"lint": "eslint . --ext .vue,.js,.jsx,.cjs,.mjs,.ts,.tsx,.cts,.mts --fix --ignore-path .gitignore" "lint": "eslint . --ext .vue,.js,.jsx,.cjs,.mjs,.ts,.tsx,.cts,.mts --fix --ignore-path .gitignore"
}, },