huangyujie
/
qihang-ecom-erp-open
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

完善docker-compose

This commit is contained in:
启航老齐 2025-12-29 14:04:41 +08:00
parent 61f4e63ff1
commit 9ddb43b8d6
5 changed files with 54 additions and 72 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
api/gateway/Dockerfile
View File

@ -2,6 +2,6 @@ FROM openjdk:17-jdk-slim
WORKDIR /app 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"] CMD ["java", "-Duser.timezone=Asia/Shanghai", "-jar", "gateway.jar"]

29
api/gateway/pom.xml
View File

@ -1,19 +1,20 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<!-- <parent>-->
<!-- <groupId>org.springframework.boot</groupId>-->
<!-- <artifactId>spring-boot-starter-parent</artifactId>-->
<!-- <version>3.0.2</version>-->
<!-- <relativePath/>-->
<!-- </parent>-->
<parent> <parent>
<groupId>cn.qihangerp.api</groupId> <groupId>org.springframework.boot</groupId>
<artifactId>api</artifactId> <artifactId>spring-boot-starter-parent</artifactId>
<version>2.12.0</version> <version>3.0.2</version>
<relativePath/>
</parent> </parent>
<!-- <parent>-->
<!-- <groupId>cn.qihangerp.api</groupId>-->
<!-- <artifactId>api</artifactId>-->
<!-- <version>2.12.0</version>-->
<!-- </parent>-->
<artifactId>gateway</artifactId> <artifactId>gateway</artifactId>
<version>1.0.0</version>
<packaging>jar</packaging> <packaging>jar</packaging>
<name>gateway</name> <name>gateway</name>
<url>http://maven.apache.org</url> <url>http://maven.apache.org</url>
@ -27,11 +28,11 @@
</properties> </properties>
<dependencies> <dependencies>
<!-- <dependency>--> <dependency>
<!-- <groupId>org.springframework.boot</groupId>--> <groupId>org.springframework.boot</groupId>
<!-- <artifactId>spring-boot-starter</artifactId>--> <artifactId>spring-boot-starter</artifactId>
<!-- <version>${spring-boot.version}</version>--> <version>${spring-boot.version}</version>
<!-- </dependency>--> </dependency>
<dependency> <dependency>
<groupId>com.alibaba.cloud</groupId> <groupId>com.alibaba.cloud</groupId>
<artifactId>spring-cloud-starter-alibaba-nacos-discovery</artifactId> <artifactId>spring-cloud-starter-alibaba-nacos-discovery</artifactId>

2
api/oms-api/Dockerfile
View File

@ -2,6 +2,6 @@ FROM openjdk:17-jdk-slim
WORKDIR /app 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"] CMD ["java", "-Duser.timezone=Asia/Shanghai", "-jar", "oms-api.jar"]

40
docker-compose.yml
View File

@ -1,6 +1,24 @@
version: '3.8' version: '3.8'
services: 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: redis:
image: redis:7 image: redis:7
container_name: redis container_name: redis
@ -35,7 +53,7 @@ services:
timeout: 5s timeout: 5s
gateway: 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 container_name: qihangerp-gateway
environment: environment:
SPRING_CLOUD_NACOS_DISCOVERY_SERVER-ADDR: "nacos:8848" SPRING_CLOUD_NACOS_DISCOVERY_SERVER-ADDR: "nacos:8848"
@ -51,7 +69,7 @@ services:
- my-network - my-network
sys-api: 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 container_name: qihangerp-sys-api
environment: environment:
SPRING_CLOUD_NACOS_DISCOVERY_SERVER-ADDR: "nacos:8848" SPRING_CLOUD_NACOS_DISCOVERY_SERVER-ADDR: "nacos:8848"
@ -63,6 +81,9 @@ services:
spring.data.redis.host: "redis" spring.data.redis.host: "redis"
spring.data.redis.port: 6379 spring.data.redis.port: 6379
spring.data.redis.password: "" 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 spring.profiles.active: dev
depends_on: depends_on:
- redis - redis
@ -72,7 +93,7 @@ services:
- my-network - my-network
oms-api: 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 container_name: qihangerp-oms-api
environment: environment:
SPRING_CLOUD_NACOS_DISCOVERY_SERVER-ADDR: "nacos:8848" SPRING_CLOUD_NACOS_DISCOVERY_SERVER-ADDR: "nacos:8848"
@ -84,6 +105,9 @@ services:
spring.data.redis.host: "redis" spring.data.redis.host: "redis"
spring.data.redis.port: 6379 spring.data.redis.port: 6379
spring.data.redis.password: "" 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 spring.profiles.active: dev
depends_on: depends_on:
- redis - redis
@ -93,7 +117,7 @@ services:
- my-network - my-network
erp-api: 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 container_name: qihangerp-erp-api
environment: environment:
SPRING_CLOUD_NACOS_DISCOVERY_SERVER-ADDR: "nacos:8848" SPRING_CLOUD_NACOS_DISCOVERY_SERVER-ADDR: "nacos:8848"
@ -105,6 +129,9 @@ services:
spring.data.redis.host: "redis" spring.data.redis.host: "redis"
spring.data.redis.port: 6379 spring.data.redis.port: 6379
spring.data.redis.password: "" 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 spring.profiles.active: dev
depends_on: depends_on:
- redis - redis
@ -114,11 +141,10 @@ services:
- my-network - my-network
vue: 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 container_name: qihangerp-vue
ports: ports:
- "80:80" # 映射88端口 - "88:88" # 映射88端口
- "443:443" # 映射88端口
# volumes: # volumes:
# - /opt/qihangerp/nginx/dist:/usr/share/nginx/html # HTML 文件目录 # - /opt/qihangerp/nginx/dist:/usr/share/nginx/html # HTML 文件目录
# - /opt/qihangerp/nginx/nginx_conf/nginx:/etc/nginx # Nginx 配置目录 # - /opt/qihangerp/nginx/nginx_conf/nginx:/etc/nginx # Nginx 配置目录

53
vue/nginx.conf
View File

@ -9,8 +9,8 @@ http {
default_type application/octet-stream; # 默认 MIME 类型 default_type application/octet-stream; # 默认 MIME 类型
server { server {
listen 80; listen 88;
server_name erp.benshutech.com; server_name erp.qihangerp.cn;
# 设置 Vue 应用的静态文件路径 # 设置 Vue 应用的静态文件路径
root /usr/share/nginx/html; root /usr/share/nginx/html;
@ -35,57 +35,12 @@ http {
proxy_connect_timeout 60s; # 连接超时时间 proxy_connect_timeout 60s; # 连接超时时间
# --- 结束新增 --- # --- 结束新增 ---
#proxy_pass http://10.0.2.22:8088/; proxy_pass http://10.0.2.22:8088/;
proxy_pass http://172.17.62.227: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;
}
} }
}