mirror of https://github.com/jumpserver/jumpserver
				
				
				
			fix: 录像存储下载报错
							parent
							
								
									fef4a97931
								
							
						
					
					
						commit
						ae364ac373
					
				|  | @ -7,7 +7,6 @@ from django.conf import settings | |||
| from terminal.models import default_storage, ReplayStorage | ||||
| from common.utils import get_logger, make_dirs | ||||
| 
 | ||||
| 
 | ||||
| logger = get_logger(__name__) | ||||
| 
 | ||||
| 
 | ||||
|  | @ -26,11 +25,13 @@ class BaseStorageHandler(object): | |||
| 
 | ||||
|     def download(self): | ||||
|         replay_storages = ReplayStorage.objects.all() | ||||
|         configs = { | ||||
|             storage.name: storage.config | ||||
|             for storage in replay_storages | ||||
|             if not storage.type_null_or_server | ||||
|         } | ||||
|         configs = {} | ||||
|         for storage in replay_storages: | ||||
|             if storage.type_sftp: | ||||
|                 continue | ||||
|             if storage.type_null_or_server: | ||||
|                 continue | ||||
|             configs[storage.name] = storage.config | ||||
|         if settings.SERVER_REPLAY_STORAGE: | ||||
|             configs['SERVER_REPLAY_STORAGE'] = settings.SERVER_REPLAY_STORAGE | ||||
|         if not configs: | ||||
|  |  | |||
|  | @ -162,6 +162,10 @@ class ReplayStorage(CommonStorageModelMixin, JMSBaseModel): | |||
|     def type_swift(self): | ||||
|         return self.type == const.ReplayStorageType.swift.value | ||||
| 
 | ||||
|     @property | ||||
|     def type_sftp(self): | ||||
|         return self.type == const.ReplayStorageType.sftp.value | ||||
| 
 | ||||
|     @property | ||||
|     def type_ceph(self): | ||||
|         return self.type == const.ReplayStorageType.ceph.value | ||||
|  |  | |||
		Loading…
	
		Reference in New Issue
	
	 wangruidong
						wangruidong