diff --git a/config/etc/nginx/omc.conf b/config/etc/nginx/omc.conf index 3fda7006..f55258a6 100644 --- a/config/etc/nginx/omc.conf +++ b/config/etc/nginx/omc.conf @@ -17,41 +17,22 @@ server { ssl_protocols TLSv1.1 TLSv1.2; ssl_prefer_server_ciphers on; -# location /api/rest/securityManagement { -# proxy_pass http://127.0.0.1:55050; -# } -# location /api/rest/resourceManagement { -# proxy_pass http://127.0.0.1:55050; -# } -# location /api/rest/performanceManagement { -# proxy_pass http://127.0.0.1:55050; -# } -# location /api/rest/faultManagement { -# proxy_pass http://127.0.0.1:55050; -# } -# location /api/rest/aaaa/ { -# proxy_pass http://127.0.0.1:44040; -# } - location /api/rest/ { - proxy_pass http://127.0.0.1:33030; - } + # OMC location / { - try_files $uri $uri/ =404; - } -} + root /usr/local/omc/htdocs/front; + + try_files $uri $uri/ /index.html; + index index.html index.htm; + } -server { - listen 38888 default_server; - listen [::]:38888 default_server; - root /usr/local/omc/htdocs/front/; - index index.html index.htm; - server_name localhost; - location /omc-api/ { proxy_pass http://127.0.0.1:33030/; - - proxy_http_version 1.1; - proxy_cache_bypass $http_upgrade; + + proxy_connect_timeout 180s; # 默认60s + proxy_send_timeout 180s; # 默认60s + proxy_read_timeout 180s; # 默认60s + + proxy_cache_bypass $http_upgrade; proxy_set_header Upgrade $http_upgrade; proxy_set_header Connection "upgrade"; proxy_set_header Host $host; @@ -62,11 +43,93 @@ server { proxy_set_header X-Forwarded-Port $server_port; } + location /api/rest/ { + # 添加斜杠并重定向 + #rewrite ^([^.]*[^/])$ $1/ permanent; + proxy_pass http://127.0.0.1:33030/api/rest/; + + proxy_cache_bypass $http_upgrade; + proxy_set_header Upgrade $http_upgrade; + proxy_set_header Connection "upgrade"; + 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_set_header X-Forwarded-Proto $scheme; + proxy_set_header X-Forwarded-Host $host; + proxy_set_header X-Forwarded-Port $server_port; + } +} + +server { + listen 44080; + listen [::]:44080; + server_name localhost; + + # 修改允许最大请求体大小为100MB + client_max_body_size 100M; + # 持久连接的超时时间默认60s + keepalive_timeout 180s; + + #access_log /var/log/nginx/host.access.log main; + + # ssl_certificate /usr/share/nginx/cert/www.x.cn_chain.crt; + # ssl_certificate_key /usr/share/nginx/cert/www.x.cn.key; + + # ssl_protocols TLSv1.1 TLSv1.2 TLSv1.3; + # ssl_session_timeout 5m; + # ssl_ciphers EECDH+CHACHA20:EECDH+AES128:RSA+AES128:EECDH+AES256:RSA+AES256:EECDH+3DES:RSA+3DES:!MD5; + # ssl_prefer_server_ciphers on; + # ssl_dhparam /usr/share/nginx/cert/dhparams.pem; + + # OMC location / { root /usr/local/omc/htdocs/front; try_files $uri $uri/ /index.html; - index index.html index.htm; + index index.html index.htm; + } + + location /omc-api/ { + proxy_pass http://127.0.0.1:33030/; + + proxy_connect_timeout 180s; # 默认60s + proxy_send_timeout 180s; # 默认60s + proxy_read_timeout 180s; # 默认60s + + proxy_cache_bypass $http_upgrade; + proxy_set_header Upgrade $http_upgrade; + proxy_set_header Connection "upgrade"; + 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_set_header X-Forwarded-Proto $scheme; + proxy_set_header X-Forwarded-Host $host; + proxy_set_header X-Forwarded-Port $server_port; + } + + location /api/rest/ { + # 添加斜杠并重定向 + #rewrite ^([^.]*[^/])$ $1/ permanent; + proxy_pass http://127.0.0.1:33030/api/rest/; + + proxy_cache_bypass $http_upgrade; + proxy_set_header Upgrade $http_upgrade; + proxy_set_header Connection "upgrade"; + 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_set_header X-Forwarded-Proto $scheme; + proxy_set_header X-Forwarded-Host $host; + proxy_set_header X-Forwarded-Port $server_port; + } + + #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 /usr/share/nginx/html; } }