From 9ddb43b8d63aa5554d17c22c059ff17f488b1327 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=90=AF=E8=88=AA=E8=80=81=E9=BD=90?= <280645618@qq.com> Date: Mon, 29 Dec 2025 14:04:41 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E5=96=84docker-compose?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- api/gateway/Dockerfile | 2 +- api/gateway/pom.xml | 29 ++++++++++++----------- api/oms-api/Dockerfile | 2 +- docker-compose.yml | 40 +++++++++++++++++++++++++------ vue/nginx.conf | 53 ++++-------------------------------------- 5 files changed, 54 insertions(+), 72 deletions(-) diff --git a/api/gateway/Dockerfile b/api/gateway/Dockerfile index 33cb50ce..85ae2683 100644 --- a/api/gateway/Dockerfile +++ b/api/gateway/Dockerfile @@ -2,6 +2,6 @@ FROM openjdk:17-jdk-slim WORKDIR /app -COPY ./target/gateway-2.12.0.jar gateway.jar +COPY ./target/gateway-1.0.0.jar gateway.jar CMD ["java", "-Duser.timezone=Asia/Shanghai", "-jar", "gateway.jar"] \ No newline at end of file diff --git a/api/gateway/pom.xml b/api/gateway/pom.xml index 132671ad..4764630b 100644 --- a/api/gateway/pom.xml +++ b/api/gateway/pom.xml @@ -1,19 +1,20 @@ 4.0.0 - - - - - - - cn.qihangerp.api - api - 2.12.0 + org.springframework.boot + spring-boot-starter-parent + 3.0.2 + + + + + + gateway + 1.0.0 jar gateway http://maven.apache.org @@ -27,11 +28,11 @@ - - - - - + + org.springframework.boot + spring-boot-starter + ${spring-boot.version} + com.alibaba.cloud spring-cloud-starter-alibaba-nacos-discovery diff --git a/api/oms-api/Dockerfile b/api/oms-api/Dockerfile index fc4e0a87..b7dda649 100644 --- a/api/oms-api/Dockerfile +++ b/api/oms-api/Dockerfile @@ -2,6 +2,6 @@ FROM openjdk:17-jdk-slim WORKDIR /app -COPY ./target/oms-api-2.12.0.jar sys-api.jar +COPY ./target/oms-api-2.12.0.jar oms-api.jar CMD ["java", "-Duser.timezone=Asia/Shanghai", "-jar", "oms-api.jar"] \ No newline at end of file diff --git a/docker-compose.yml b/docker-compose.yml index 02007200..ef4f4017 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,6 +1,24 @@ version: '3.8' services: + mysql: + image: mysql:8 + container_name: mysql + environment: + MYSQL_ROOT_PASSWORD: rootpassword + MYSQL_DATABASE: qihang_erp + MYSQL_USER: qihang_erp + MYSQL_PASSWORD: qihang_erp@123 + ports: + - "3306:3306" + volumes: + - /opt/qihangerp-open/mysql_data:/var/lib/mysql + - ./my.cnf:/etc/mysql/conf.d/my.cnf + restart: always + networks: + - my-network + + redis: image: redis:7 container_name: redis @@ -35,7 +53,7 @@ services: timeout: 5s gateway: - image: crpi-km68smz26eegv27m.cn-shenzhen.personal.cr.aliyuncs.com/qihang-open/gateway + image: crpi-km68smz26eegv27m.cn-shenzhen.personal.cr.aliyuncs.com/qihang-open/gateway:v251229 container_name: qihangerp-gateway environment: SPRING_CLOUD_NACOS_DISCOVERY_SERVER-ADDR: "nacos:8848" @@ -51,7 +69,7 @@ services: - my-network sys-api: - image: crpi-km68smz26eegv27m.cn-shenzhen.personal.cr.aliyuncs.com/qihang-open/sys-api + image: crpi-km68smz26eegv27m.cn-shenzhen.personal.cr.aliyuncs.com/qihang-open/sys-api:v251229 container_name: qihangerp-sys-api environment: SPRING_CLOUD_NACOS_DISCOVERY_SERVER-ADDR: "nacos:8848" @@ -63,6 +81,9 @@ services: spring.data.redis.host: "redis" spring.data.redis.port: 6379 spring.data.redis.password: "" + SPRING_DATASOURCE_URL: "jdbc:mysql://mysql:3306/qihang_erp?useSSL=false&serverTimezone=UTC" + SPRING_DATASOURCE_USERNAME: "qihang_erp" + SPRING_DATASOURCE_PASSWORD: "qihang_erp@123" spring.profiles.active: dev depends_on: - redis @@ -72,7 +93,7 @@ services: - my-network oms-api: - image: crpi-km68smz26eegv27m.cn-shenzhen.personal.cr.aliyuncs.com/qihang-open/oms-api + image: crpi-km68smz26eegv27m.cn-shenzhen.personal.cr.aliyuncs.com/qihang-open/oms-api:v251229 container_name: qihangerp-oms-api environment: SPRING_CLOUD_NACOS_DISCOVERY_SERVER-ADDR: "nacos:8848" @@ -84,6 +105,9 @@ services: spring.data.redis.host: "redis" spring.data.redis.port: 6379 spring.data.redis.password: "" + SPRING_DATASOURCE_URL: "jdbc:mysql://mysql:3306/qihang_erp?useSSL=false&serverTimezone=UTC" + SPRING_DATASOURCE_USERNAME: "qihang_erp" + SPRING_DATASOURCE_PASSWORD: "qihang_erp@123" spring.profiles.active: dev depends_on: - redis @@ -93,7 +117,7 @@ services: - my-network erp-api: - image: crpi-km68smz26eegv27m.cn-shenzhen.personal.cr.aliyuncs.com/qihang-open/erp-api + image: crpi-km68smz26eegv27m.cn-shenzhen.personal.cr.aliyuncs.com/qihang-open/erp-api:v251229 container_name: qihangerp-erp-api environment: SPRING_CLOUD_NACOS_DISCOVERY_SERVER-ADDR: "nacos:8848" @@ -105,6 +129,9 @@ services: spring.data.redis.host: "redis" spring.data.redis.port: 6379 spring.data.redis.password: "" + SPRING_DATASOURCE_URL: "jdbc:mysql://mysql:3306/qihang_erp?useSSL=false&serverTimezone=UTC" + SPRING_DATASOURCE_USERNAME: "qihang_erp" + SPRING_DATASOURCE_PASSWORD: "qihang_erp@123" spring.profiles.active: dev depends_on: - redis @@ -114,11 +141,10 @@ services: - my-network vue: - image: crpi-km68smz26eegv27m.cn-shenzhen.personal.cr.aliyuncs.com/qihang-open/vue-erp + image: crpi-km68smz26eegv27m.cn-shenzhen.personal.cr.aliyuncs.com/qihang-open/vue-erp:v251229a container_name: qihangerp-vue ports: - - "80:80" # 映射88端口 - - "443:443" # 映射88端口 + - "88:88" # 映射88端口 # volumes: # - /opt/qihangerp/nginx/dist:/usr/share/nginx/html # HTML 文件目录 # - /opt/qihangerp/nginx/nginx_conf/nginx:/etc/nginx # Nginx 配置目录 diff --git a/vue/nginx.conf b/vue/nginx.conf index 0a68eb40..c0bacf39 100644 --- a/vue/nginx.conf +++ b/vue/nginx.conf @@ -9,8 +9,8 @@ http { default_type application/octet-stream; # 默认 MIME 类型 server { - listen 80; - server_name erp.benshutech.com; + listen 88; + server_name erp.qihangerp.cn; # 设置 Vue 应用的静态文件路径 root /usr/share/nginx/html; @@ -35,57 +35,12 @@ http { proxy_connect_timeout 60s; # 连接超时时间 # --- 结束新增 --- - #proxy_pass http://10.0.2.22:8088/; - proxy_pass http://172.17.62.227:8088/; + proxy_pass http://10.0.2.22:8088/; + #proxy_pass http://172.17.62.227:8088/; } } - server { - listen 443 ssl; - server_name erp.benshutech.com; - #charset koi8-r; - - #access_log logs/host.access.log main;/opt/cert - - ssl_certificate /etc/nginx/cert/benshutech.com.pem; - ssl_certificate_key /etc/nginx/cert/benshutech.com.key; - ssl_session_timeout 5m; - ssl_ciphers HIGH:!aNULL:!MD5; - ssl_prefer_server_ciphers on; - - location / { - root /usr/share/nginx/html; - index index.html index.htm; - try_files $uri $uri/ /index.html; - } - - # 处理 /prod-api/ 的代理请求 - location /prod-api/ { - proxy_set_header Host $http_host; - proxy_set_header X-Real-IP $remote_addr; - proxy_set_header REMOTE-HOST $remote_addr; - proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; - # --- 新增 SSE 关键配置 --- - proxy_http_version 1.1; # 必须使用 HTTP/1.1 - proxy_buffering off; # 关闭缓冲，确保数据实时发送 - proxy_read_timeout 1800s; # 增加读取超时时间 (例如 30 分钟) - proxy_send_timeout 1800s; # 增加发送超时时间 (例如 30 分钟) - proxy_connect_timeout 60s; # 连接超时时间 - # --- 结束新增 --- - proxy_pass http://172.17.62.227:8088/; - } - - #error_page 404 /404.html; - - # redirect server error pages to the static page /50x.html - # - error_page 500 502 503 504 /50x.html; - location = /50x.html { - root html; - } - - } }