[Merge] merge with dev

Dockerfile

 FROM registry.fit2cloud.com/jumpserver/python:v3
 MAINTAINER Jumpserver Team <ibuler@qq.com>
 
-COPY . /opt/coco
+COPY requirements /opt/coco/requirements
 WORKDIR /opt/coco
 
 RUN cd requirements && yum -y install $(cat rpm_requirements.txt) && \
    pip install -r requirements.txt
-
+COPY . /opt/coco
 VOLUME /opt/coco/logs
 VOLUME /opt/coco/keys
 

coco/models.py

@@ -228,5 +228,5 @@ class WSProxy:
     def close(self):
         self.stop_event.set()
         self.child.close()
-        self.ws.on_logout(self.connection)
+        self.ws.logout(self.connection)
         logger.debug("Proxy {} closed".format(self))