From dcf33358ca3bc546206ad5cc7abc156e74830c4c Mon Sep 17 00:00:00 2001 From: horizonlin Date: Tue, 11 Dec 2018 14:26:37 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0urlprotocol=E9=85=8D=E7=BD=AE?= =?UTF-8?q?=E8=AF=BB=E5=8F=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 增加urlprotocol配置读取 --- server/www/teleport/webroot/app/base/configs.py | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/server/www/teleport/webroot/app/base/configs.py b/server/www/teleport/webroot/app/base/configs.py index b3df8a6..993f374 100644 --- a/server/www/teleport/webroot/app/base/configs.py +++ b/server/www/teleport/webroot/app/base/configs.py @@ -456,6 +456,18 @@ class AppConfig(BaseAppConfig): if conf_data is None: log.w('system default config info is empty.\n') # return True + # ===================================== + # 全局设置相关 + # ===================================== + try: + _glob = json.loads(conf_data['global']) + except: + log.w('password config not set or invalid, use default.\n') + _glob = {} + + self.sys.glob = tp_convert_to_attr_dict(_glob) + if not self.sys.glob.is_exists('url_proto'): + self.sys.glob.url_proto = False # ===================================== # 密码策略相关