update

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列表

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()

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'

web/templates/default/setting.html

@@ -129,7 +129,7 @@
 
 				<p class="mtb15">
 					<span class="set-tit text-right" title="API接口" style="float: left;">API接口</span>
-					<input class="btswitch btswitch-ios" id="cfg_panel_api" type="checkbox" {{data['api_token']}}/>
+					<input class="btswitch btswitch-ios" id="cfg_panel_api" type="checkbox" {% if data['panel_api']['open'] %}checked{% endif %}/>
 	                <label class="btswitch-btn ml5" for="cfg_panel_api" style="float: left;margin-top:4px;" onclick="setPanelApi()"></label>
 	                <button ype="button" class="btn btn-default btn-xs" style="vertical-align: middle; margin-left: 10px" onclick="appPage();">APP应用管理</button>
 					<span class="set-info c7">提供面板API接口访问的支持</span>

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