fix

docker-compose-maneger.yml

@@ -5,6 +5,8 @@ services:
     container_name: htwin-maneger
     environment:
       - CI_COMMIT_SHA=4ed0d409e1fd8ab651634df64cd24a74ee82f9b5
+    volumes:
+      - ./maneger-conf/nginx.conf:/etc/nginx/nginx.conf
     ports:
       - "8522:80"
     restart: always
\ No newline at end of file

docker-compose-web.yml

@@ -6,7 +6,7 @@ services:
     environment:
       - CI_COMMIT_SHA=4ed0d409e1fd8ab651634df64cd24a74ee82f9b5
     volumes:
-      - ./upload:/upload
+      - ./web-conf/nginx.conf:/etc/nginx/nginx.conf
     ports:
       - "8521:80"
     restart: always
\ No newline at end of file

maneger-conf/nginx.conf

+user  nginx;
+worker_processes  1;
+error_log  /var/log/nginx/error.log warn;
+pid        /var/run/nginx.pid;
+events {
+  worker_connections  1024;
+}
+
+http {
+  include       /etc/nginx/mime.types;
+  default_type  application/octet-stream;
+  log_format  main  '$remote_addr - $remote_user [$time_local] "$request" '
+                    '$status $body_bytes_sent "$http_referer" '
+                    '"$http_user_agent" "$http_x_forwarded_for"';
+  access_log  /var/log/nginx/access.log  main;
+  sendfile        on;
+  keepalive_timeout  65;
+  client_max_body_size 10m;
+
+  upstream hscloudApi {
+    server htwin-dbapi:8520;
+  }
+
+  server {
+    listen       80;
+    server_name  127.0.0.1;
+    location / {
+      root   /app;
+      index  index.html;
+      try_files $uri $uri/ /index.html;
+    }
+
+    # 代理配置，解决跨域问题
+      location /prod-api/ {
+         proxy_set_header Host $host;
+         proxy_set_header X-Real-IP $remote_addr;
+         proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+          proxy_pass http://hscloudApi/;
+        }
+        location /test-api/ {
+         proxy_set_header Host $host;
+         proxy_set_header X-Real-IP $remote_addr;
+         proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+          proxy_pass http://hscloudApi/;
+        }
+      
+
+    error_page   500 502 503 504  /50x.html;
+    location = /50x.html {
+      root   /usr/share/nginx/html;
+    }
+  }
+}

web-conf/nginx.conf

+user  nginx;
+worker_processes  1;
+error_log  /var/log/nginx/error.log warn;
+pid        /var/run/nginx.pid;
+events {
+  worker_connections  1024;
+}
+
+http {
+  include       /etc/nginx/mime.types;
+  default_type  application/octet-stream;
+  log_format  main  '$remote_addr - $remote_user [$time_local] "$request" '
+                    '$status $body_bytes_sent "$http_referer" '
+                    '"$http_user_agent" "$http_x_forwarded_for"';
+  access_log  /var/log/nginx/access.log  main;
+  sendfile        on;
+  keepalive_timeout  65;
+  client_max_body_size 10m;
+
+  upstream hscloudApi {
+    server htwin-dbapi:8520;
+  }
+
+  server {
+    listen       80;
+    server_name  127.0.0.1;
+    location / {
+      root   /app;
+      index  index.html;
+      try_files $uri $uri/ /index.html;
+    }
+
+    # 代理配置，解决跨域问题
+      location /api/ {
+         proxy_set_header Host $host;
+         proxy_set_header X-Real-IP $remote_addr;
+         proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+          proxy_pass http://hscloudApi/;
+        }
+        location /test-api/ {
+         proxy_set_header Host $host;
+         proxy_set_header X-Real-IP $remote_addr;
+         proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+          proxy_pass http://hscloudApi/;
+        }
+      
+
+    error_page   500 502 503 504  /50x.html;
+    location = /50x.html {
+      root   /usr/share/nginx/html;
+    }
+  }
+}