diff --git a/config/open-im-online-example.conf b/config/open-im-ng-example.conf similarity index 82% rename from config/open-im-online-example.conf rename to config/open-im-ng-example.conf index 43e7b4c68..a13cdc7a0 100644 --- a/config/open-im-online-example.conf +++ b/config/open-im-ng-example.conf @@ -33,26 +33,26 @@ upstream im_open_rtc{ } server { - listen 443; - server_name web.rentsoft.cn ; #1 web im 端 域名 + listen 11443; + server_name web.rentsoft.cn; #1 web im 端 域名 ssl on; - ssl_certificate /etc/nginx/conf.d/ssl/web.rentsoft.cn .crt; #2 证书 - ssl_certificate_key /etc/nginx/conf.d/ssl/web.rentsoft.cn .key; #3 证书 + ssl_certificate /etc/nginx/conf.d/ssl/web.rentsoft.cn.crt; #2 证书 + ssl_certificate_key /etc/nginx/conf.d/ssl/web.rentsoft.cn.key; #3 证书 ssl_session_timeout 5m; gzip on; - gzip_min_length 1k; + gzip_min_length 1k; gzip_buffers 4 16k; gzip_comp_level 2; gzip_types text/plain application/javascript application/x-javascript text/css application/xml text/javascript application/x-httpd-php image/jpeg image/gif image/png; gzip_vary off; gzip_disable "MSIE [1-6]\."; error_page 405 =200 $uri; - location / { #web demo + location /{ #web demo proxy_set_header Host $host; proxy_set_header X-Real-Ip $remote_addr; proxy_set_header X-Forwarded-For $remote_addr; proxy_set_header X-NginX-Proxy true; - root /data1/online/Pc-Web-Demo/build/; # web im静态资源存放路径 + root /data1/website/web/build/; # web im静态资源存放路径 index index.html; try_files $uri $uri/ /index.html; } @@ -64,7 +64,7 @@ server { proxy_set_header X-Forwarded-For $remote_addr; proxy_pass http://im_msg_gateway/; } - location /api { #10002 api + location ^~/api/ { #10002 api proxy_http_version 1.1; proxy_set_header Upgrade $http_upgrade; proxy_set_header Connection "Upgrade"; @@ -80,7 +80,7 @@ server { proxy_set_header X-Forwarded-For $remote_addr; proxy_pass http://im_jssdk_gateway/; } - location /demo { # 10004 demo + location ^~/demo/ { # 10004 demo proxy_http_version 1.1; proxy_set_header Upgrade $http_upgrade; proxy_set_header Connection "Upgrade"; @@ -88,7 +88,7 @@ server { proxy_set_header X-Forwarded-For $remote_addr; proxy_pass http://im_demo/; } - location /admin { #10006 admin + location ^~/admin/ { #10006 admin proxy_http_version 1.1; proxy_set_header Upgrade $http_upgrade; proxy_set_header Connection "Upgrade"; @@ -96,7 +96,7 @@ server { proxy_set_header X-Forwarded-For $remote_addr; proxy_pass http://im_admin/; } - location /grafana { #10007 prometheus + location ^~/grafana/ { #10007 prometheus proxy_http_version 1.1; proxy_set_header Upgrade $http_upgrade; proxy_set_header Connection "Upgrade"; @@ -104,15 +104,15 @@ server { proxy_set_header X-Forwarded-For $remote_addr; proxy_pass http://im_grafana/; } - location /chat { #10008 chat login + location ^~/chat/ { #10008 chat login proxy_http_version 1.1; proxy_set_header Upgrade $http_upgrade; proxy_set_header Connection "Upgrade"; proxy_set_header X-real-ip $remote_addr; - proxy_set_header X-Forwarded-For $remote_addr; + proxy_set_header X-Forwarded-For $remote_addr; proxy_pass http://im_chat/; } - location /complete_admin { #10009 admin + location ^~/complete_admin/ { #10009 admin proxy_http_version 1.1; proxy_set_header Upgrade $http_upgrade; proxy_set_header Connection "Upgrade"; @@ -120,7 +120,7 @@ server { proxy_set_header X-Forwarded-For $remote_addr; proxy_pass http://im_complete_admin/; } - location /organization { #10010 organization + location ^~/organization/ { #10010 organization proxy_http_version 1.1; proxy_set_header Upgrade $http_upgrade; proxy_set_header Connection "Upgrade"; @@ -128,14 +128,23 @@ server { proxy_set_header X-Forwarded-For $remote_addr; proxy_pass http://im_organization/; } - location /open_rtc { #7880 rtc + location ^~/open_rtc/ { #7880 rtc + proxy_http_version 1.1; + proxy_set_header Upgrade $http_upgrade; + proxy_set_header Connection "Upgrade"; + proxy_set_header X-real-ip $remote_addr; + proxy_set_header X-Forwarded-For $remote_addr; + proxy_pass http://im_open_rtc/; + } + location ^~/storage/ { #minio proxy_http_version 1.1; proxy_set_header Upgrade $http_upgrade; proxy_set_header Connection "Upgrade"; proxy_set_header X-real-ip $remote_addr; proxy_set_header X-Forwarded-For $remote_addr; - proxy_pass http://im_open_rtc; + proxy_pass http://127.0.0.1:10005/; } + } server { @@ -146,11 +155,11 @@ server { server { ssl_session_timeout 5m; - listen 443; + listen 11443; server_name storage.rentsoft.cn; #1 MinIO存储域名 ssl on; - ssl_certificate /etc/nginx/conf.d/ssl/storage.rentsoft.cn_nginx/storage.rentsoft.cn_bundle.crt; #证书 - ssl_certificate_key /etc/nginx/conf.d/ssl/storage.rentsoft.cn_nginx/storage.rentsoft.cn.key; #证书 + ssl_certificate /etc/nginx/conf.d/ssl/storage.rentsoft.cn.crt; #证书 + ssl_certificate_key /etc/nginx/conf.d/ssl/storage.rentsoft.cn.key; #证书 gzip on; gzip_min_length 1k; gzip_buffers 4 16k; @@ -171,7 +180,7 @@ server { server { - listen 443; + listen 11443; server_name admin.rentsoft.cn; #后台管理域名 ssl on; ssl_certificate /etc/nginx/conf.d/ssl/admin.rentsoft.cn.crt; # 证书 @@ -189,7 +198,7 @@ server { proxy_set_header X-Real-Ip $remote_addr; proxy_set_header X-Forwarded-For $remote_addr; proxy_set_header X-NginX-Proxy true; - root /data/test/admin-test/dist/; #管理后台web静态资源存放路径 + root /data1/website/admin/dist/; #管理后台web静态资源存放路径 index index.html; try_files $uri $uri/ /index.html; } @@ -200,27 +209,3 @@ server { server_name admin.rentsoft.cn; #管理后台 域名 rewrite ^(.*)$ https://${server_name}$1 permanent; } - - -server { - listen 51000; - server_name web.rentsoft.cn ; - ssl on; - ssl_certificate /etc/nginx/conf.d/ssl/web.rentsoft.cn .crt; - ssl_certificate_key /etc/nginx/conf.d/ssl/web.rentsoft.cn .key; - ssl_session_timeout 5m; - client_max_body_size 200m; - gzip on; - gzip_min_length 1k; - gzip_buffers 4 16k; - gzip_comp_level 2; - gzip_types text/plain application/javascript application/x-javascript text/css application/xml text/javascript application/x-httpd-php image/jpeg image/gif image/png; - gzip_vary off; - gzip_disable "MSIE [1-6]\."; - location / { - proxy_http_version 1.1; - proxy_set_header X-real-ip $remote_addr; - proxy_set_header X-Forwarded-For $remote_addr; - proxy_pass http://127.0.0.1:8081; - } -}