From af6915b1b0b8215d6ce016fbf12bc0dd522b14af Mon Sep 17 00:00:00 2001 From: skiffer-git <44203734@qq.com> Date: Wed, 9 Nov 2022 18:24:45 +0800 Subject: [PATCH 1/8] install_im_server --- .env | 2 +- config/config.yaml | 10 +- config/open-im-online.conf | 237 +++++++++++++++++++++++++++++++++++++ script/.env | 2 +- 4 files changed, 244 insertions(+), 7 deletions(-) create mode 100644 config/open-im-online.conf diff --git a/.env b/.env index 17f7ebb68..fbe982494 100644 --- a/.env +++ b/.env @@ -1,3 +1,3 @@ USER=root -PASSWORD=openIM +PASSWORD=openIM123 DATA_DIR=./ \ No newline at end of file diff --git a/config/config.yaml b/config/config.yaml index 08bc152a7..55c939ad2 100644 --- a/config/config.yaml +++ b/config/config.yaml @@ -15,7 +15,7 @@ k8sMod: false #开启k8s模式 使用pod里面环境变量请求services调用 mysql: dbMysqlAddress: [ 127.0.0.1:13306 ] #mysql地址 目前仅支持单机，默认即可 dbMysqlUserName: root #mysql用户名，建议修改 - dbMysqlPassword: openIM # mysql密码，建议修改 + dbMysqlPassword: openIM123 # mysql密码，建议修改 dbMysqlDatabaseName: openIM_v2 #默认即可 dbTableName: eMsg #默认即可 dbMsgTableNum: 1 @@ -34,7 +34,7 @@ mongo: dbDatabase: openIM #mongo db 默认即可 dbSource: admin dbUserName: root #mongo用户名，建议先不设置 - dbPassword: openIM #mongo密码，建议先不设置 + dbPassword: openIM123 #mongo密码，建议先不设置 dbMaxPoolSize: 100 dbRetainChatRecords: 3650 #mongo保存离线消息时间（天），根据需求修改 chatRecordsClearTime: "* * * * *" # 每天凌晨3点清除消息，该配置和linux定时任务一样， 清理操作建议设置在用户活跃少的时候 # 0 3 * * * @@ -45,7 +45,7 @@ redis: dbMaxActive: 0 dbIdleTimeout: 120 dbUserName: #only redis version 6.0+ need username - dbPassWord: openIM #redis密码 建议修改 + dbPassWord: openIM123 #redis密码 建议修改 enableCluster: false #如果外部redis以集群方式启动，需要打开此开关 kafka: @@ -125,8 +125,8 @@ credential: #腾讯cos，发送图片、视频、文件时需要，请自行申 endpoint: http://127.0.0.1:10005 #minio外网ip 这个ip是给客户端访问的 endpointInner: http://127.0.0.1:10005 #minio内网地址 如果im server 可以通过内网访问到 minio就可以 endpointInnerEnable: true #是否启用minio内网地址 启用可以让桶初始化，IM server连接minio走内网地址访问 - accessKeyID: user12345 - secretAccessKey: key12345 + accessKeyID: root + secretAccessKey: openIM123 storageTime: 50 #文件在minio中保存的时间 isDistributedMod: false # 是否分布式多硬盘部署 默认docker-compose中为false ali: # ali oss diff --git a/config/open-im-online.conf b/config/open-im-online.conf new file mode 100644 index 000000000..de1d0c56c --- /dev/null +++ b/config/open-im-online.conf @@ -0,0 +1,237 @@ +upstream im_msg_gateway{ + server 127.0.0.1:10001; #指定后端服务器地址 根据部署情况可指定多台 + } +upstream im_api{ + server 127.0.0.1:10002; #指定后端服务器地址 根据部署情况可指定多台 + } +upstream im_jssdk_gateway{ + server 127.0.0.1:10003; #指定后端服务器地址 根据部署情况可指定多台 + } +upstream im_demo{ + server 127.0.0.1:10004; #指定后端服务器地址 根据部署情况可指定多台 + } +upstream im_admin{ + server 127.0.0.1:10006; #指定后端服务器地址 根据部署情况可指定多台 + } +upstream im_grafana{ + server 127.0.0.1:10007; #指定后端服务器地址 docker-compose启动所在机器 + } +upstream im_chat{ + server 127.0.0.1:10008; #指定后端服务器地址 根据部署情况可指定多台 + } +upstream im_complete_admin{ + server 127.0.0.1:10009; #指定后端服务器地址 根据部署情况可指定多台 + } +upstream im_organization{ + server 127.0.0.1:10010; #指定后端服务器地址 根据部署情况可指定多台 + } + +server { + listen 443; + server_name open-im-online.rentsoft.cn; #1 + ssl on; + ssl_certificate /etc/nginx/conf.d/ssl/open-im-online.rentsoft.cn.crt; #2 + ssl_certificate_key /etc/nginx/conf.d/ssl/open-im-online.rentsoft.cn.key; #3 + ssl_session_timeout 5m; + 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]\."; + error_page 405 =200 $uri; + 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/; #4 + index index.html; + try_files $uri $uri/ /index.html; + } + + location /msg_gateway { #10001 ws + 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_msg_gateway; + } + + location /api { #10002 api + 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_api; + } + + location /jssdk_gateway { #10003 jssdk + 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_jssdk_gateway; + } + + location /demo { # 10004 demo + 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_demo; + } + + location /admin { #10006 admin + 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_admin; + } + location /grafana { #10007 prometheus + 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_grafana; + } + 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_pass http://im_chat; + } + location /complete_admin { #10009 admin + 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_complete_admin; + } + location /organization { #10010 organization + 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_organization; + }//organization +} + + +server { + listen 80; + server_name open-im-online.rentsoft.cn; #1 + rewrite ^(.*)$ https://${server_name}$1 permanent; +} + + + + + + + + +server { + listen 51000; + server_name open-im-online.rentsoft.cn; + ssl on; + ssl_certificate /etc/nginx/conf.d/ssl/open-im-online.rentsoft.cn.crt; + ssl_certificate_key /etc/nginx/conf.d/ssl/open-im-online.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; + } +} + + +server { + listen 57880; + server_name open-im-online.rentsoft.cn; + ssl on; + ssl_certificate /etc/nginx/conf.d/ssl/open-im-online.rentsoft.cn.crt; + ssl_certificate_key /etc/nginx/conf.d/ssl/open-im-online.rentsoft.cn.key; + ssl_session_timeout 5m; + + 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 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://127.0.0.1:7880; + } +} + + + + +upstream storage { + server 127.0.0.1:10005; +} + +server { + # listen 443; + # server_name storage-online.rentsoft.cn; + # ssl on + # ssl_certificate /etc/nginx/conf.d/ssl/storage-online.rentsoft.cn_bundle.crt; + # ssl_certificate_key /etc/nginx/conf.d/ssl/storage-online.rentsoft.cn.key; + ssl_session_timeout 5m; + + listen 443; + server_name storage-online.rentsoft.cn; + + ssl on; + ssl_certificate /etc/nginx/conf.d/ssl/storage-online.rentsoft.cn_nginx/storage-online.rentsoft.cn_bundle.crt; + ssl_certificate_key /etc/nginx/conf.d/ssl/storage-online.rentsoft.cn_nginx/storage-online.rentsoft.cn.key; + + + 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_pass http://127.0.0.1:10005/; + 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 Host $http_host; + proxy_http_version 1.1; + client_max_body_size 8000M; + + } +} diff --git a/script/.env b/script/.env index 17f7ebb68..fbe982494 100644 --- a/script/.env +++ b/script/.env @@ -1,3 +1,3 @@ USER=root -PASSWORD=openIM +PASSWORD=openIM123 DATA_DIR=./ \ No newline at end of file From dfcfa643f0568e67fe62ebf2dc70e608d7722ead Mon Sep 17 00:00:00 2001 From: skiffer-git <44203734@qq.com> Date: Wed, 9 Nov 2022 21:05:14 +0800 Subject: [PATCH 2/8] nginx config --- config/open-im-online.conf | 225 ++++++++++++++++++------------------- 1 file changed, 107 insertions(+), 118 deletions(-) diff --git a/config/open-im-online.conf b/config/open-im-online.conf index de1d0c56c..43e7b4c68 100644 --- a/config/open-im-online.conf +++ b/config/open-im-online.conf @@ -1,37 +1,43 @@ upstream im_msg_gateway{ - server 127.0.0.1:10001; #指定后端服务器地址 根据部署情况可指定多台 - } + server 127.0.0.1:10001; #IM消息服务器地址 根据部署情况可指定多台 + } upstream im_api{ - server 127.0.0.1:10002; #指定后端服务器地址 根据部署情况可指定多台 - } + server 127.0.0.1:10002; #IM群组用户api服务器地址 根据部署情况可指定多台 + } upstream im_jssdk_gateway{ - server 127.0.0.1:10003; #指定后端服务器地址 根据部署情况可指定多台 - } + server 127.0.0.1:10003; #IM jssdk服务器地址 根据部署情况可指定多台 + } upstream im_demo{ - server 127.0.0.1:10004; #指定后端服务器地址 根据部署情况可指定多台 - } + server 127.0.0.1:10004; #IM demo登录注册服务器地址 根据部署情况可指定多台 + } +upstream storage { + server 127.0.0.1:10005; #MinIO服务器地址 暂时支持1台 + } upstream im_admin{ - server 127.0.0.1:10006; #指定后端服务器地址 根据部署情况可指定多台 - } + server 127.0.0.1:10006; #IM admin服务器地址 根据部署情况可指定多台 + } upstream im_grafana{ - server 127.0.0.1:10007; #指定后端服务器地址 docker-compose启动所在机器 - } + server 127.0.0.1:10007; #IM 统计服务器地址 docker-compose启动所在机器 + } upstream im_chat{ - server 127.0.0.1:10008; #指定后端服务器地址 根据部署情况可指定多台 - } + server 127.0.0.1:10008; #IM 商业版登录注册服务器地址 根据部署情况可指定多台 + } upstream im_complete_admin{ - server 127.0.0.1:10009; #指定后端服务器地址 根据部署情况可指定多台 - } + server 127.0.0.1:10009; #IM 商业版admin地址 根据部署情况可指定多台 + } upstream im_organization{ - server 127.0.0.1:10010; #指定后端服务器地址 根据部署情况可指定多台 - } + server 127.0.0.1:10010; #IM 商业版组织架构服务器地址 根据部署情况可指定多台 + } +upstream im_open_rtc{ + server 127.0.0.1:7880; #rtc 音视频通话 服务器地址 根据部署情况可指定多台 + } server { listen 443; - server_name open-im-online.rentsoft.cn; #1 + server_name web.rentsoft.cn ; #1 web im 端 域名 ssl on; - ssl_certificate /etc/nginx/conf.d/ssl/open-im-online.rentsoft.cn.crt; #2 - ssl_certificate_key /etc/nginx/conf.d/ssl/open-im-online.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; @@ -46,54 +52,49 @@ 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 /data1/online/Pc-Web-Demo/build/; #4 + root /data1/online/Pc-Web-Demo/build/; # web im静态资源存放路径 index index.html; try_files $uri $uri/ /index.html; } - location /msg_gateway { #10001 ws 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_msg_gateway; + proxy_pass http://im_msg_gateway/; } - location /api { #10002 api 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_api; + proxy_pass http://im_api/; } - location /jssdk_gateway { #10003 jssdk 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_jssdk_gateway; + proxy_pass http://im_jssdk_gateway/; } - location /demo { # 10004 demo 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_demo; + proxy_pass http://im_demo/; } - location /admin { #10006 admin 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_admin; + proxy_pass http://im_admin/; } location /grafana { #10007 prometheus proxy_http_version 1.1; @@ -101,7 +102,7 @@ server { 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_grafana; + proxy_pass http://im_grafana/; } location /chat { #10008 chat login proxy_http_version 1.1; @@ -109,7 +110,7 @@ server { 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_chat; + proxy_pass http://im_chat/; } location /complete_admin { #10009 admin proxy_http_version 1.1; @@ -117,7 +118,7 @@ server { 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_complete_admin; + proxy_pass http://im_complete_admin/; } location /organization { #10010 organization proxy_http_version 1.1; @@ -125,32 +126,89 @@ server { 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_organization; - }//organization + proxy_pass http://im_organization/; + } + 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; + } +} + +server { + listen 80; + server_name web.rentsoft.cn ; #1 web im 端 域名 + rewrite ^(.*)$ https://${server_name}$1 permanent; +} + +server { + ssl_session_timeout 5m; + listen 443; + 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; #证书 + 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_pass http://storage; + 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 Host $http_host; + proxy_http_version 1.1; + client_max_body_size 8000M; + } } +server { + listen 443; + server_name admin.rentsoft.cn; #后台管理域名 + ssl on; + ssl_certificate /etc/nginx/conf.d/ssl/admin.rentsoft.cn.crt; # 证书 + ssl_certificate_key /etc/nginx/conf.d/ssl/admin.rentsoft.cn.key; #证书 + ssl_session_timeout 5m; + 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_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 /data/test/admin-test/dist/; #管理后台web静态资源存放路径 + index index.html; + try_files $uri $uri/ /index.html; + } +} + server { listen 80; - server_name open-im-online.rentsoft.cn; #1 + server_name admin.rentsoft.cn; #管理后台 域名 rewrite ^(.*)$ https://${server_name}$1 permanent; } - - - - - - server { listen 51000; - server_name open-im-online.rentsoft.cn; + server_name web.rentsoft.cn ; ssl on; - ssl_certificate /etc/nginx/conf.d/ssl/open-im-online.rentsoft.cn.crt; - ssl_certificate_key /etc/nginx/conf.d/ssl/open-im-online.rentsoft.cn.key; + 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; @@ -160,78 +218,9 @@ server { gzip_vary off; gzip_disable "MSIE [1-6]\."; location / { - proxy_http_version 1.1; + 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; } } - - -server { - listen 57880; - server_name open-im-online.rentsoft.cn; - ssl on; - ssl_certificate /etc/nginx/conf.d/ssl/open-im-online.rentsoft.cn.crt; - ssl_certificate_key /etc/nginx/conf.d/ssl/open-im-online.rentsoft.cn.key; - ssl_session_timeout 5m; - - 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 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://127.0.0.1:7880; - } -} - - - - -upstream storage { - server 127.0.0.1:10005; -} - -server { - # listen 443; - # server_name storage-online.rentsoft.cn; - # ssl on - # ssl_certificate /etc/nginx/conf.d/ssl/storage-online.rentsoft.cn_bundle.crt; - # ssl_certificate_key /etc/nginx/conf.d/ssl/storage-online.rentsoft.cn.key; - ssl_session_timeout 5m; - - listen 443; - server_name storage-online.rentsoft.cn; - - ssl on; - ssl_certificate /etc/nginx/conf.d/ssl/storage-online.rentsoft.cn_nginx/storage-online.rentsoft.cn_bundle.crt; - ssl_certificate_key /etc/nginx/conf.d/ssl/storage-online.rentsoft.cn_nginx/storage-online.rentsoft.cn.key; - - - 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_pass http://127.0.0.1:10005/; - 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 Host $http_host; - proxy_http_version 1.1; - client_max_body_size 8000M; - - } -} From e52f65f690b4ff5fc4a4d8a78b8d3ae419482bf7 Mon Sep 17 00:00:00 2001 From: skiffer-git <44203734@qq.com> Date: Thu, 10 Nov 2022 09:23:19 +0800 Subject: [PATCH 3/8] slack --- README.md | 2 +- config/open-im-online.conf | 226 ------------------------------------- 2 files changed, 1 insertion(+), 227 deletions(-) delete mode 100644 config/open-im-online.conf diff --git a/README.md b/README.md index 567dcf8df..6a3d03465 100644 --- a/README.md +++ b/README.md @@ -27,7 +27,7 @@ By deployment of the Open-IM-Server on the customer's server, developers can int ## Community -- Join the Telegram-OpenIM group: https://t.me/joinchat/zSJLPaHBNLZmODI1 +- Join Slack Community : https://join.slack.com/t/openimcommunity/shared_invite/zt-1jo5m1wm9-ym2qj0LUU5UbO68L6Z1zQg - 中文官网访问这里：[Open-IM中文开发文档](https://doc.rentsoft.cn/) ## Quick start diff --git a/config/open-im-online.conf b/config/open-im-online.conf deleted file mode 100644 index 43e7b4c68..000000000 --- a/config/open-im-online.conf +++ /dev/null @@ -1,226 +0,0 @@ -upstream im_msg_gateway{ - server 127.0.0.1:10001; #IM消息服务器地址 根据部署情况可指定多台 - } -upstream im_api{ - server 127.0.0.1:10002; #IM群组用户api服务器地址 根据部署情况可指定多台 - } -upstream im_jssdk_gateway{ - server 127.0.0.1:10003; #IM jssdk服务器地址 根据部署情况可指定多台 - } -upstream im_demo{ - server 127.0.0.1:10004; #IM demo登录注册服务器地址 根据部署情况可指定多台 - } -upstream storage { - server 127.0.0.1:10005; #MinIO服务器地址 暂时支持1台 - } -upstream im_admin{ - server 127.0.0.1:10006; #IM admin服务器地址 根据部署情况可指定多台 - } -upstream im_grafana{ - server 127.0.0.1:10007; #IM 统计服务器地址 docker-compose启动所在机器 - } -upstream im_chat{ - server 127.0.0.1:10008; #IM 商业版登录注册服务器地址 根据部署情况可指定多台 - } -upstream im_complete_admin{ - server 127.0.0.1:10009; #IM 商业版admin地址 根据部署情况可指定多台 - } -upstream im_organization{ - server 127.0.0.1:10010; #IM 商业版组织架构服务器地址 根据部署情况可指定多台 - } -upstream im_open_rtc{ - server 127.0.0.1:7880; #rtc 音视频通话 服务器地址 根据部署情况可指定多台 - } - -server { - listen 443; - 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_session_timeout 5m; - 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]\."; - error_page 405 =200 $uri; - 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静态资源存放路径 - index index.html; - try_files $uri $uri/ /index.html; - } - location /msg_gateway { #10001 ws - 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_msg_gateway/; - } - location /api { #10002 api - 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_api/; - } - location /jssdk_gateway { #10003 jssdk - 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_jssdk_gateway/; - } - location /demo { # 10004 demo - 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_demo/; - } - location /admin { #10006 admin - 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_admin/; - } - location /grafana { #10007 prometheus - 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_grafana/; - } - 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_pass http://im_chat/; - } - location /complete_admin { #10009 admin - 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_complete_admin/; - } - location /organization { #10010 organization - 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_organization/; - } - 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; - } -} - -server { - listen 80; - server_name web.rentsoft.cn ; #1 web im 端 域名 - rewrite ^(.*)$ https://${server_name}$1 permanent; -} - -server { - ssl_session_timeout 5m; - listen 443; - 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; #证书 - 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_pass http://storage; - 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 Host $http_host; - proxy_http_version 1.1; - client_max_body_size 8000M; - } -} - - -server { - listen 443; - server_name admin.rentsoft.cn; #后台管理域名 - ssl on; - ssl_certificate /etc/nginx/conf.d/ssl/admin.rentsoft.cn.crt; # 证书 - ssl_certificate_key /etc/nginx/conf.d/ssl/admin.rentsoft.cn.key; #证书 - ssl_session_timeout 5m; - 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_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 /data/test/admin-test/dist/; #管理后台web静态资源存放路径 - index index.html; - try_files $uri $uri/ /index.html; - } -} - -server { - listen 80; - 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; - } -} From d22c3867c15a2d000b8f2ecbca485abc32ca55d1 Mon Sep 17 00:00:00 2001 From: skiffer-git <44203734@qq.com> Date: Thu, 10 Nov 2022 09:23:28 +0800 Subject: [PATCH 4/8] slack --- config/open-im-online-example.conf | 226 +++++++++++++++++++++++++++++ 1 file changed, 226 insertions(+) create mode 100644 config/open-im-online-example.conf diff --git a/config/open-im-online-example.conf b/config/open-im-online-example.conf new file mode 100644 index 000000000..43e7b4c68 --- /dev/null +++ b/config/open-im-online-example.conf @@ -0,0 +1,226 @@ +upstream im_msg_gateway{ + server 127.0.0.1:10001; #IM消息服务器地址 根据部署情况可指定多台 + } +upstream im_api{ + server 127.0.0.1:10002; #IM群组用户api服务器地址 根据部署情况可指定多台 + } +upstream im_jssdk_gateway{ + server 127.0.0.1:10003; #IM jssdk服务器地址 根据部署情况可指定多台 + } +upstream im_demo{ + server 127.0.0.1:10004; #IM demo登录注册服务器地址 根据部署情况可指定多台 + } +upstream storage { + server 127.0.0.1:10005; #MinIO服务器地址 暂时支持1台 + } +upstream im_admin{ + server 127.0.0.1:10006; #IM admin服务器地址 根据部署情况可指定多台 + } +upstream im_grafana{ + server 127.0.0.1:10007; #IM 统计服务器地址 docker-compose启动所在机器 + } +upstream im_chat{ + server 127.0.0.1:10008; #IM 商业版登录注册服务器地址 根据部署情况可指定多台 + } +upstream im_complete_admin{ + server 127.0.0.1:10009; #IM 商业版admin地址 根据部署情况可指定多台 + } +upstream im_organization{ + server 127.0.0.1:10010; #IM 商业版组织架构服务器地址 根据部署情况可指定多台 + } +upstream im_open_rtc{ + server 127.0.0.1:7880; #rtc 音视频通话 服务器地址 根据部署情况可指定多台 + } + +server { + listen 443; + 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_session_timeout 5m; + 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]\."; + error_page 405 =200 $uri; + 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静态资源存放路径 + index index.html; + try_files $uri $uri/ /index.html; + } + location /msg_gateway { #10001 ws + 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_msg_gateway/; + } + location /api { #10002 api + 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_api/; + } + location /jssdk_gateway { #10003 jssdk + 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_jssdk_gateway/; + } + location /demo { # 10004 demo + 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_demo/; + } + location /admin { #10006 admin + 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_admin/; + } + location /grafana { #10007 prometheus + 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_grafana/; + } + 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_pass http://im_chat/; + } + location /complete_admin { #10009 admin + 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_complete_admin/; + } + location /organization { #10010 organization + 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_organization/; + } + 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; + } +} + +server { + listen 80; + server_name web.rentsoft.cn ; #1 web im 端 域名 + rewrite ^(.*)$ https://${server_name}$1 permanent; +} + +server { + ssl_session_timeout 5m; + listen 443; + 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; #证书 + 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_pass http://storage; + 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 Host $http_host; + proxy_http_version 1.1; + client_max_body_size 8000M; + } +} + + +server { + listen 443; + server_name admin.rentsoft.cn; #后台管理域名 + ssl on; + ssl_certificate /etc/nginx/conf.d/ssl/admin.rentsoft.cn.crt; # 证书 + ssl_certificate_key /etc/nginx/conf.d/ssl/admin.rentsoft.cn.key; #证书 + ssl_session_timeout 5m; + 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_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 /data/test/admin-test/dist/; #管理后台web静态资源存放路径 + index index.html; + try_files $uri $uri/ /index.html; + } +} + +server { + listen 80; + 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; + } +} From e7e08a94a976c203ae4c49c7aa104c84aed175a6 Mon Sep 17 00:00:00 2001 From: skiffer-git <44203734@qq.com> Date: Thu, 10 Nov 2022 14:24:30 +0800 Subject: [PATCH 5/8] slack --- ...e-example.conf => open-im-ng-example.conf} | 77 ++++++++----------- 1 file changed, 31 insertions(+), 46 deletions(-) rename config/{open-im-online-example.conf => open-im-ng-example.conf} (82%) 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; + 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://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; - } -} From e52be45659d3622e245a888279127098357082c8 Mon Sep 17 00:00:00 2001 From: skiffer-git <44203734@qq.com> Date: Thu, 10 Nov 2022 14:26:39 +0800 Subject: [PATCH 6/8] slack --- config/open-im-ng-example.conf | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/config/open-im-ng-example.conf b/config/open-im-ng-example.conf index a13cdc7a0..1251f0b41 100644 --- a/config/open-im-ng-example.conf +++ b/config/open-im-ng-example.conf @@ -29,7 +29,7 @@ upstream im_organization{ server 127.0.0.1:10010; #IM 商业版组织架构服务器地址 根据部署情况可指定多台 } upstream im_open_rtc{ - server 127.0.0.1:7880; #rtc 音视频通话 服务器地址 根据部署情况可指定多台 + server 127.0.0.1:7880; #rtc 音视频通话 服务器地址 根据部署情况可指定多台 } server { @@ -136,15 +136,6 @@ server { 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://127.0.0.1:10005/; - } - } server { From 6ced618c1ce7a641c1793424cef5e2558fd38221 Mon Sep 17 00:00:00 2001 From: skiffer-git <44203734@qq.com> Date: Thu, 10 Nov 2022 14:56:29 +0800 Subject: [PATCH 7/8] nginx config --- config/open-im-ng-example.conf | 31 ++++++++++++++++--------------- 1 file changed, 16 insertions(+), 15 deletions(-) diff --git a/config/open-im-ng-example.conf b/config/open-im-ng-example.conf index 1251f0b41..319c7d314 100644 --- a/config/open-im-ng-example.conf +++ b/config/open-im-ng-example.conf @@ -29,15 +29,16 @@ upstream im_organization{ server 127.0.0.1:10010; #IM 商业版组织架构服务器地址 根据部署情况可指定多台 } upstream im_open_rtc{ - server 127.0.0.1:7880; #rtc 音视频通话 服务器地址 根据部署情况可指定多台 + server 127.0.0.1:7880; #rtc 音视频通话 服务器地址 根据部署情况可指定多台 } server { - listen 11443; - server_name web.rentsoft.cn; #1 web im 端 域名 + listen 443; + server_name test-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/test-web.rentsoft.cn.crt; #2 证书 + ssl_certificate_key /etc/nginx/conf.d/ssl/test-web.rentsoft.cn.key; #3 证书 ssl_session_timeout 5m; gzip on; gzip_min_length 1k; @@ -140,17 +141,17 @@ server { server { listen 80; - server_name web.rentsoft.cn ; #1 web im 端 域名 + server_name test-web.rentsoft.cn ; #1 web im 端 域名 rewrite ^(.*)$ https://${server_name}$1 permanent; } server { ssl_session_timeout 5m; - listen 11443; - server_name storage.rentsoft.cn; #1 MinIO存储域名 + listen 443; + server_name test-storage.rentsoft.cn; #1 MinIO存储域名 ssl on; - ssl_certificate /etc/nginx/conf.d/ssl/storage.rentsoft.cn.crt; #证书 - ssl_certificate_key /etc/nginx/conf.d/ssl/storage.rentsoft.cn.key; #证书 + ssl_certificate /etc/nginx/conf.d/ssl/test-storage.rentsoft.cn.crt; #证书 + ssl_certificate_key /etc/nginx/conf.d/ssl/test-storage.rentsoft.cn.key; #证书 gzip on; gzip_min_length 1k; gzip_buffers 4 16k; @@ -171,11 +172,11 @@ server { server { - listen 11443; - server_name admin.rentsoft.cn; #后台管理域名 + listen 443; + server_name test-admin.rentsoft.cn; #后台管理域名 ssl on; - ssl_certificate /etc/nginx/conf.d/ssl/admin.rentsoft.cn.crt; # 证书 - ssl_certificate_key /etc/nginx/conf.d/ssl/admin.rentsoft.cn.key; #证书 + ssl_certificate /etc/nginx/conf.d/ssl/test-admin.rentsoft.cn.crt; # 证书 + ssl_certificate_key /etc/nginx/conf.d/ssl/test-admin.rentsoft.cn.key; #证书 ssl_session_timeout 5m; gzip on; gzip_min_length 1k; @@ -197,6 +198,6 @@ server { server { listen 80; - server_name admin.rentsoft.cn; #管理后台 域名 + server_name test-admin.rentsoft.cn; #管理后台 域名 rewrite ^(.*)$ https://${server_name}$1 permanent; } From 66960b147a36e01c553d4aa092e621f416647269 Mon Sep 17 00:00:00 2001 From: skiffer-git <44203734@qq.com> Date: Thu, 10 Nov 2022 22:09:05 +0800 Subject: [PATCH 8/8] nginx config --- config/open-im-ng-example.conf | 36 ++++++++++++++++++---------------- 1 file changed, 19 insertions(+), 17 deletions(-) diff --git a/config/open-im-ng-example.conf b/config/open-im-ng-example.conf index 319c7d314..12e15a4f1 100644 --- a/config/open-im-ng-example.conf +++ b/config/open-im-ng-example.conf @@ -11,7 +11,7 @@ upstream im_demo{ server 127.0.0.1:10004; #IM demo登录注册服务器地址 根据部署情况可指定多台 } upstream storage { - server 127.0.0.1:10005; #MinIO服务器地址 暂时支持1台 + server 127.0.0.1:10005; #MinIO服务器地址 暂时支持1台 } upstream im_admin{ server 127.0.0.1:10006; #IM admin服务器地址 根据部署情况可指定多台 @@ -34,26 +34,28 @@ upstream im_open_rtc{ server { listen 443; - server_name test-web.rentsoft.cn; #1 web im 端 域名 + server_name web.rentsoft.cn; #1 web im 端 域名 ssl on; - ssl_certificate /etc/nginx/conf.d/ssl/test-web.rentsoft.cn.crt; #2 证书 - ssl_certificate_key /etc/nginx/conf.d/ssl/test-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_types text/plain application/javascript application/x-javascript text/css application/xml text/javascript application/x-httpd-php image/jpeg image/gif image/png application/wasm; gzip_vary off; gzip_disable "MSIE [1-6]\."; error_page 405 =200 $uri; + + default_type application/wasm; 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/website/web/build/; # web im静态资源存放路径 + root /data1/online/Pc-Web-Demo/build/; # web im静态资源存放路径 index index.html; try_files $uri $uri/ /index.html; } @@ -110,7 +112,7 @@ server { 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 @@ -141,17 +143,17 @@ server { server { listen 80; - server_name test-web.rentsoft.cn ; #1 web im 端 域名 + server_name web.rentsoft.cn ; #1 web im 端 域名 rewrite ^(.*)$ https://${server_name}$1 permanent; } server { ssl_session_timeout 5m; listen 443; - server_name test-storage.rentsoft.cn; #1 MinIO存储域名 + server_name storage.rentsoft.cn; #1 MinIO存储域名 ssl on; - ssl_certificate /etc/nginx/conf.d/ssl/test-storage.rentsoft.cn.crt; #证书 - ssl_certificate_key /etc/nginx/conf.d/ssl/test-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; @@ -173,10 +175,10 @@ server { server { listen 443; - server_name test-admin.rentsoft.cn; #后台管理域名 + server_name admin.rentsoft.cn; #后台管理域名 ssl on; - ssl_certificate /etc/nginx/conf.d/ssl/test-admin.rentsoft.cn.crt; # 证书 - ssl_certificate_key /etc/nginx/conf.d/ssl/test-admin.rentsoft.cn.key; #证书 + ssl_certificate /etc/nginx/conf.d/ssl/admin.rentsoft.cn.crt; # 证书 + ssl_certificate_key /etc/nginx/conf.d/ssl/admin.rentsoft.cn.key; #证书 ssl_session_timeout 5m; gzip on; gzip_min_length 1k; @@ -190,7 +192,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 /data1/website/admin/dist/; #管理后台web静态资源存放路径 + root /data1/online/Open-IM-Admin/dist/; #管理后台web静态资源存放路径 index index.html; try_files $uri $uri/ /index.html; } @@ -198,6 +200,6 @@ server { server { listen 80; - server_name test-admin.rentsoft.cn; #管理后台 域名 + server_name admin.rentsoft.cn; #管理后台 域名 rewrite ^(.*)$ https://${server_name}$1 permanent; }