Commit c1844f22 authored by ibuler's avatar ibuler

Merge remote-tracking branch 'origin/dev' into dev

parents fdd31846 c82e66a7
...@@ -181,6 +181,7 @@ class ProxyNamespace(BaseNamespace): ...@@ -181,6 +181,7 @@ class ProxyNamespace(BaseNamespace):
user_id = host.get('user', None) user_id = host.get('user', None)
logger.debug("self.current_user") logger.debug("self.current_user")
self.current_user = self.app.service.get_user_profile(user_id) self.current_user = self.app.service.get_user_profile(user_id)
self.clients[request.sid]["request"].user = self.current_user
logger.debug(self.current_user) logger.debug(self.current_user)
# { # {
......
...@@ -20,7 +20,7 @@ Jinja2==2.10 ...@@ -20,7 +20,7 @@ Jinja2==2.10
jmespath==0.9.3 jmespath==0.9.3
jms-es-sdk==0.5.2 jms-es-sdk==0.5.2
jms-storage==0.0.12 jms-storage==0.0.12
jumpserver-python-sdk==0.0.39 jumpserver-python-sdk==0.0.40
MarkupSafe==1.0 MarkupSafe==1.0
oss2==2.4.0 oss2==2.4.0
paramiko==2.4.0 paramiko==2.4.0
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment