diff --git a/.gitignore b/.gitignore index aa94ce4..d08b00a 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ data/maven/mavenRep qiezi_front/yarn.lock +.idea \ No newline at end of file diff --git a/config/nginx.conf b/config/nginx.conf index bf14ccb..e7a8b2c 100644 --- a/config/nginx.conf +++ b/config/nginx.conf @@ -32,21 +32,28 @@ http { server_name _; location /qiezi/api/ { - proxy_pass http://backend:8088; + proxy_pass http://qiezi_backend:8088; proxy_set_header Host $host; proxy_set_header X-Real-IP $remote_addr; client_max_body_size 100m; } location /{ - root /opt/dist/indexResource; - } + alias /opt/dist/indexResource/; + index index.html; + try_files $uri $uri/ /index.html; + } location /manage { - root /opt/dist; + alias /opt/dist/; index index.html; try_files $uri $uri/ /index.html; } - + + location /qiezijs { + root /opt/dist/; + index index.html; + try_files $uri $uri/ /index.html; + } } } diff --git a/docker-compose.yml b/docker-compose.yml index 855c32a..25f37be 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,6 +1,6 @@ version: "2" services: - front: + qiezi_front: image: nginx networks: - qiezi_statistic @@ -12,7 +12,7 @@ services: ports: - ${NGINX_PORT}:8080 - backend: + qiezi_backend: image: openjdk:11.0 networks: - qiezi_statistic diff --git a/qiezi_front/public/index.html b/qiezi_front/public/index.html index cc65fa3..af462db 100644 --- a/qiezi_front/public/index.html +++ b/qiezi_front/public/index.html @@ -17,6 +17,6 @@
- +