From 75c75632ad4c5cd9b485611a94d4104adf76757b Mon Sep 17 00:00:00 2001 From: yumoqing Date: Tue, 9 May 2023 14:43:34 +0800 Subject: [PATCH] bugfix --- ahserver/__init__.py | 0 ahserver/auth_api.py | 0 ahserver/baseProcessor.py | 0 ahserver/configuredServer.py | 0 ahserver/dbadmin.py | 0 ahserver/dsProcessor.py | 0 ahserver/error.py | 0 ahserver/filedownload.py | 0 ahserver/filestorage.py | 0 ahserver/functionProcessor.py | 0 ahserver/globalEnv.py | 0 ahserver/myTE.py | 0 ahserver/p2p_middleware.py | 0 ahserver/processorResource.py | 11 ++++++----- ahserver/proxyProcessor.py | 0 ahserver/restful.py | 0 ahserver/serverenv.py | 0 ahserver/sqldsProcessor.py | 0 ahserver/uriop.py | 0 ahserver/url2file.py | 0 ahserver/utils.py | 0 ahserver/version.py | 0 ahserver/websocketProcessor.py | 0 ahserver/xlsxData.py | 0 ahserver/xlsxdsProcessor.py | 0 25 files changed, 6 insertions(+), 5 deletions(-) mode change 100644 => 100755 ahserver/__init__.py mode change 100644 => 100755 ahserver/auth_api.py mode change 100644 => 100755 ahserver/baseProcessor.py mode change 100644 => 100755 ahserver/configuredServer.py mode change 100644 => 100755 ahserver/dbadmin.py mode change 100644 => 100755 ahserver/dsProcessor.py mode change 100644 => 100755 ahserver/error.py mode change 100644 => 100755 ahserver/filedownload.py mode change 100644 => 100755 ahserver/filestorage.py mode change 100644 => 100755 ahserver/functionProcessor.py mode change 100644 => 100755 ahserver/globalEnv.py mode change 100644 => 100755 ahserver/myTE.py mode change 100644 => 100755 ahserver/p2p_middleware.py mode change 100644 => 100755 ahserver/processorResource.py mode change 100644 => 100755 ahserver/proxyProcessor.py mode change 100644 => 100755 ahserver/restful.py mode change 100644 => 100755 ahserver/serverenv.py mode change 100644 => 100755 ahserver/sqldsProcessor.py mode change 100644 => 100755 ahserver/uriop.py mode change 100644 => 100755 ahserver/url2file.py mode change 100644 => 100755 ahserver/utils.py mode change 100644 => 100755 ahserver/version.py mode change 100644 => 100755 ahserver/websocketProcessor.py mode change 100644 => 100755 ahserver/xlsxData.py mode change 100644 => 100755 ahserver/xlsxdsProcessor.py diff --git a/ahserver/__init__.py b/ahserver/__init__.py old mode 100644 new mode 100755 diff --git a/ahserver/auth_api.py b/ahserver/auth_api.py old mode 100644 new mode 100755 diff --git a/ahserver/baseProcessor.py b/ahserver/baseProcessor.py old mode 100644 new mode 100755 diff --git a/ahserver/configuredServer.py b/ahserver/configuredServer.py old mode 100644 new mode 100755 diff --git a/ahserver/dbadmin.py b/ahserver/dbadmin.py old mode 100644 new mode 100755 diff --git a/ahserver/dsProcessor.py b/ahserver/dsProcessor.py old mode 100644 new mode 100755 diff --git a/ahserver/error.py b/ahserver/error.py old mode 100644 new mode 100755 diff --git a/ahserver/filedownload.py b/ahserver/filedownload.py old mode 100644 new mode 100755 diff --git a/ahserver/filestorage.py b/ahserver/filestorage.py old mode 100644 new mode 100755 diff --git a/ahserver/functionProcessor.py b/ahserver/functionProcessor.py old mode 100644 new mode 100755 diff --git a/ahserver/globalEnv.py b/ahserver/globalEnv.py old mode 100644 new mode 100755 diff --git a/ahserver/myTE.py b/ahserver/myTE.py old mode 100644 new mode 100755 diff --git a/ahserver/p2p_middleware.py b/ahserver/p2p_middleware.py old mode 100644 new mode 100755 diff --git a/ahserver/processorResource.py b/ahserver/processorResource.py old mode 100644 new mode 100755 index 16a05b4..84a97a4 --- a/ahserver/processorResource.py +++ b/ahserver/processorResource.py @@ -313,21 +313,22 @@ class ProcessorResource(AppLogger, StaticResource,Url2File): def url2processor(self, request, url, fpath): print('fpath=', fpath) - if fpath is None: - return None config = getConfig() url = self.entireUrl(request, url) host = '/'.join(str(request.url).split('/')[:3]) - path = url[len(host):].split('?')[0] + path = request.path real_path = self.abspath(request, path) - if real_path is None: - return None + print(f'url2processor():{path=}, {real_path=}') if config.website.startswiths: for a in config.website.startswiths: if path.startswith(a.leading): processor = FunctionProcessor(path,self,a) return processor + if real_path is None: + return None + if fpath is None: + return None for word, handlername in self.y_processors: if fpath.endswith(word): Klass = getProcessor(handlername) diff --git a/ahserver/proxyProcessor.py b/ahserver/proxyProcessor.py old mode 100644 new mode 100755 diff --git a/ahserver/restful.py b/ahserver/restful.py old mode 100644 new mode 100755 diff --git a/ahserver/serverenv.py b/ahserver/serverenv.py old mode 100644 new mode 100755 diff --git a/ahserver/sqldsProcessor.py b/ahserver/sqldsProcessor.py old mode 100644 new mode 100755 diff --git a/ahserver/uriop.py b/ahserver/uriop.py old mode 100644 new mode 100755 diff --git a/ahserver/url2file.py b/ahserver/url2file.py old mode 100644 new mode 100755 diff --git a/ahserver/utils.py b/ahserver/utils.py old mode 100644 new mode 100755 diff --git a/ahserver/version.py b/ahserver/version.py old mode 100644 new mode 100755 diff --git a/ahserver/websocketProcessor.py b/ahserver/websocketProcessor.py old mode 100644 new mode 100755 diff --git a/ahserver/xlsxData.py b/ahserver/xlsxData.py old mode 100644 new mode 100755 diff --git a/ahserver/xlsxdsProcessor.py b/ahserver/xlsxdsProcessor.py old mode 100644 new mode 100755