Merge branch 'red-develop' into 'product-dev'

{bug fix} edit ws to wss testcase1

See merge request rms/Backend/api-main-service!838

app/applicationlayer/management/notification/routing.py

@@ -5,4 +5,5 @@ from app.applicationlayer.management.notification import consumers
 
 websocket_urlpatterns = [
     url(r'^ws/chat/(?P<room_name>[^/]+)/$', consumers.ChatConsumer),
+    url(r'^wss/chat/(?P<room_name>[^/]+)/$', consumers.ChatConsumer),
 ]
\ No newline at end of file

app/entities/templates/chat/room.html

@@ -14,7 +14,7 @@
     var roomName = {{ room_name_json }};
 
     var chatSocket = new WebSocket(
-        'ws://' + window.location.host +
+        'wss://' + window.location.host +
         '/ws/chat/' + roomName + '/');
 
     chatSocket.onmessage = function(e) {