From 2c46707c2b4893429c9f0407aff513584453ff0a Mon Sep 17 00:00:00 2001
From: ibuler <ibuler@qq.com>
Date: Fri, 27 Sep 2019 10:20:20 +0800
Subject: [PATCH] =?UTF-8?q?[Update]=20=E4=BF=AE=E6=94=B9websocket=E7=9B=91?=
 =?UTF-8?q?=E5=90=AC=E7=AB=AF=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 apps/jumpserver/conf.py | 1 +
 config_example.yml      | 1 +
 jms                     | 2 +-
 3 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/apps/jumpserver/conf.py b/apps/jumpserver/conf.py
index 5fb1444df..16476accc 100644
--- a/apps/jumpserver/conf.py
+++ b/apps/jumpserver/conf.py
@@ -376,6 +376,7 @@ defaults = {
     'RADIUS_SECRET': '',
     'HTTP_BIND_HOST': '0.0.0.0',
     'HTTP_LISTEN_PORT': 8080,
+    'WS_LISTEN_PORT': 8082,
     'LOGIN_LOG_KEEP_DAYS': 90,
     'ASSETS_PERM_CACHE_TIME': 3600*24,
     'SECURITY_MFA_VERIFY_TTL': 3600,
diff --git a/config_example.yml b/config_example.yml
index 40f30998d..102b0b1be 100644
--- a/config_example.yml
+++ b/config_example.yml
@@ -44,6 +44,7 @@ DB_NAME: jumpserver
 # 运行时绑定端口
 HTTP_BIND_HOST: 0.0.0.0
 HTTP_LISTEN_PORT: 8080
+WS_LISTEN_PORT: 8082
 
 # Use Redis as broker for celery and web socket
 # Redis配置
diff --git a/jms b/jms
index a6eaddeb5..5aeb20855 100755
--- a/jms
+++ b/jms
@@ -47,7 +47,7 @@ LOG_DIR = os.path.join(BASE_DIR, 'logs')
 TMP_DIR = os.path.join(BASE_DIR, 'tmp')
 HTTP_HOST = CONFIG.HTTP_BIND_HOST or '127.0.0.1'
 HTTP_PORT = CONFIG.HTTP_LISTEN_PORT or 8080
-WS_PORT = HTTP_PORT + 1
+WS_PORT = CONFIG.WS_LISTEN_PORT or 8082
 DEBUG = CONFIG.DEBUG or False
 LOG_LEVEL = CONFIG.LOG_LEVEL or 'INFO'