diff --git a/web/admin/setting/app.py b/web/admin/setting/app.py index 5b025a3e4..273e19ce8 100644 --- a/web/admin/setting/app.py +++ b/web/admin/setting/app.py @@ -29,12 +29,15 @@ import thisdb @blueprint.route('/set_panel_api', endpoint='set_panel_api', methods=['POST']) @panel_login_required def set_panel_api(): - admin_api = thisdb.getOption('api', default='no') - if admin_api == 'no': - thisdb.setOption('api', 'yes') + panel_api = thisdb.getOptionByJson('panel_api', default={'open':False}) + if not panel_api['open']: + panel_api['open'] = True + thisdb.setOption('panel_api', json.dumps(panel_api)) return mw.returnData(True, '开启API成功!') - thisdb.setOption('api', 'no') - return mw.returnData(True, '开启API成功!') + else: + panel_api['open'] = False + thisdb.setOption('panel_api', json.dumps(panel_api)) + return mw.returnData(True, '关闭API成功!') # 获取APP列表 diff --git a/web/admin/setup/option.py b/web/admin/setup/option.py index d6c8c87a5..7542f3791 100644 --- a/web/admin/setup/option.py +++ b/web/admin/setup/option.py @@ -53,7 +53,7 @@ def init_option(): thisdb.setOption('admin_path', mw.getRandomString(8)) # API是否开启|默认关闭 - thisdb.setOption('api', 'no') + thisdb.setOption('panel_api', json.dumps({'open':False})) # 获取服务器IP ip = mw.getLocalIp() diff --git a/web/setting.py b/web/setting.py index d0c09281e..500849760 100755 --- a/web/setting.py +++ b/web/setting.py @@ -45,8 +45,8 @@ if os.path.exists(default_port_file): else: from utils.firewall import Firewall as MwFirewall mw_port = str(random.randint(10000, 65530)) - MwFirewall.instance().addAcceptPort(panel_port, 'PANEL端口', 'port') - mw.writeFile(default_port_file, panel_port) + MwFirewall.instance().addAcceptPort(mw_port, 'PANEL端口', 'port') + mw.writeFile(default_port_file, mw_port) bind = [] default_ipv6_file = panel_dir+'/data/ipv6.pl' diff --git a/web/templates/default/setting.html b/web/templates/default/setting.html index 1c5edea6c..9a123904a 100755 --- a/web/templates/default/setting.html +++ b/web/templates/default/setting.html @@ -129,7 +129,7 @@

API接口 - + 提供面板API接口访问的支持 diff --git a/web/utils/config.py b/web/utils/config.py index ac7be3a21..ee081e86b 100644 --- a/web/utils/config.py +++ b/web/utils/config.py @@ -81,9 +81,9 @@ def getGlobalVar(): # 邮件通知设置 data['notify_email'] = thisdb.getOptionByJson('notify_email', default={'open':False}, type='notify') data['notify_tgbot'] = thisdb.getOptionByJson('notify_tgbot', default={'open':False}, type='notify') - + + data['panel_api'] = thisdb.getOptionByJson('panel_api', default={'open':False}) data['panel_ssl'] = thisdb.getOptionByJson('panel_ssl', default={'open':False}) data['panel_domain'] = thisdb.getOption('panel_domain', default='') - return data \ No newline at end of file