From f685054a9a5a3c18aba21496d21a417d8ca1b932 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Wed, 13 Nov 2024 14:45:53 +0800
Subject: [PATCH] update

---
 web/admin/setting/app.py | 13 +++++++++++++
 web/core/mw.py           |  3 +++
 web/setting.py           |  2 +-
 web/static/app/config.js |  2 +-
 4 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/web/admin/setting/app.py b/web/admin/setting/app.py
index 441f068bf..5b025a3e4 100644
--- a/web/admin/setting/app.py
+++ b/web/admin/setting/app.py
@@ -25,6 +25,17 @@ import utils.config as utils_config
 from .setting import blueprint
 import thisdb
 
+# 设置API
+@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')
+        return mw.returnData(True, '开启API成功!')
+    thisdb.setOption('api', 'no')
+    return mw.returnData(True, '开启API成功!')
+
 
 # 获取APP列表
 @blueprint.route('/get_app_list', endpoint='get_app_list', methods=['POST'])
@@ -48,6 +59,8 @@ def add_app():
     app_id = request.form.get('app_id', '').strip()
     app_secret = request.form.get('app_secret', '1').strip()
     limit_addr = request.form.get('limit_addr', '').strip()
+    if limit_addr == '':
+        return mw.returnData(False, 'IP限制不能为空!')
 
     rid = thisdb.addApp(app_id,app_secret,limit_addr)
     if rid > 0:
diff --git a/web/core/mw.py b/web/core/mw.py
index f3310d32c..0d7a8f6a2 100644
--- a/web/core/mw.py
+++ b/web/core/mw.py
@@ -84,6 +84,9 @@ def getPanelDataDir():
 def getMWLogs():
     return getPanelDir() + '/logs'
 
+def getPanelLogs():
+    return getPanelDir() + '/logs'
+
 def getPanelTmp():
     return getPanelDir() + '/tmp'
 
diff --git a/web/setting.py b/web/setting.py
index 5afb73d0a..929e1e547 100755
--- a/web/setting.py
+++ b/web/setting.py
@@ -41,7 +41,7 @@ else:
     from utils.firewall import Firewall as MwFirewall
     mw_port = str(random.randint(10000, 65530))
     MwFirewall.instance().addAcceptPort(panel_port, 'PANEL端口', 'port')
-    mw.writeFile('data/port.pl', panel_port)
+    mw.writeFile(default_port_file panel_port)
 
 bind = []
 default_ipv6_file = panel_dir+'/data/ipv6.pl'
diff --git a/web/static/app/config.js b/web/static/app/config.js
index 4c3783e6b..a56a25a10 100755
--- a/web/static/app/config.js
+++ b/web/static/app/config.js
@@ -1464,7 +1464,7 @@ function showPanelApi(){
 
 function setPanelApi(){
 	var cfg_panel_api = $('#cfg_panel_api').prop("checked");
-	$.post('/setting/set_panel_token', {'op_type':"2"},function(rdata){
+	$.post('/setting/set_panel_api', {},function(rdata){
 		showMsg(rdata.msg, function(){
 			if (rdata.status){
 				addApp();