Unverified Commit 3bf7d061 authored by 老广's avatar 老广 Committed by GitHub

Merge pull request #1055 from jumpserver/dev

Dev
parents 60bc42f6 51e15b58
...@@ -36,7 +36,6 @@ Jumpserver采纳分布式架构,支持多机房跨区域部署,中心节点 ...@@ -36,7 +36,6 @@ Jumpserver采纳分布式架构,支持多机房跨区域部署,中心节点
也可以查看我们完整文档包括了使用和开发 [文档](http://docs.jumpserver.org) 也可以查看我们完整文档包括了使用和开发 [文档](http://docs.jumpserver.org)
### Demo 和 截图 ### Demo 和 截图
我们提供了DEMO和截图可以让你快速了解Jumpserver 我们提供了DEMO和截图可以让你快速了解Jumpserver
......
...@@ -288,8 +288,12 @@ class SessionReplayViewSet(viewsets.ViewSet): ...@@ -288,8 +288,12 @@ class SessionReplayViewSet(viewsets.ViewSet):
if value.get("TYPE", '') == "s3": if value.get("TYPE", '') == "s3":
client, bucket = self.s3Client(value) client, bucket = self.s3Client(value)
try: try:
client.head_object(Bucket=bucket, Key=path) date = self.session.date_start.strftime('%Y-%m-%d')
client.download_file(bucket, path, default_storage.base_location + '/' + path)
client.head_object(Bucket=bucket,
Key=os.path.join(date, str(self.session.id) + '.replay.gz'))
client.download_file(bucket, os.path.join(date, str(self.session.id) + '.replay.gz'),
default_storage.base_location + '/' + path)
return redirect(default_storage.url(path)) return redirect(default_storage.url(path))
except: except:
pass pass
......
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