From a1bb8b9816b897de905ef7f8025286669c5239e7 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Wed, 4 Dec 2024 00:34:49 +0800
Subject: [PATCH] update

---
 web/admin/system/system.py | 10 +++++++---
 web/core/mw.py             |  2 ++
 web/utils/system/main.py   | 26 +++++++++++++++++++++++++-
 3 files changed, 34 insertions(+), 4 deletions(-)

diff --git a/web/admin/system/system.py b/web/admin/system/system.py
index d483e9d23..febe77bcc 100644
--- a/web/admin/system/system.py
+++ b/web/admin/system/system.py
@@ -20,8 +20,6 @@ import core.mw as mw
 import utils.system as sys
 import thisdb
 
-
-
 blueprint = Blueprint('system', __name__, url_prefix='/system', template_folder='../../templates')
 
 # 获取系统的统计信息
@@ -37,6 +35,12 @@ def system_total():
     data['version'] = '0.0.1'
     return data
 
+# 获取环境信息
+@blueprint.route('/get_env_info', endpoint='get_env_info', methods=['GET','POST'])
+@panel_login_required
+def get_env_info():
+    return sys.getEnvInfo()
+
 # 获取系统的网络流量信息
 @blueprint.route('/network', endpoint='network')
 @panel_login_required
@@ -50,7 +54,7 @@ def network():
     return stat
 
 # 获取系统的磁盘信息
-@blueprint.route('/disk_info', endpoint='disk_info')
+@blueprint.route('/disk_info', endpoint='disk_info', methods=['GET','POST'])
 @panel_login_required
 def disk_info():
     data = sys.getDiskInfo()
diff --git a/web/core/mw.py b/web/core/mw.py
index a92ed095f..b3e56bc58 100644
--- a/web/core/mw.py
+++ b/web/core/mw.py
@@ -310,6 +310,8 @@ def returnData(status, msg, data=None):
     return {'status': status, 'msg': msg, 'data': data}
 
 def returnJson(status, msg, data=None):
+    if not data:
+        return getJson({'status': status, 'msg': msg})
     return getJson({'status': status, 'msg': msg, 'data': data})
 
 def readFile(filename):
diff --git a/web/utils/system/main.py b/web/utils/system/main.py
index 8ace24d77..fa2ccdf11 100644
--- a/web/utils/system/main.py
+++ b/web/utils/system/main.py
@@ -15,9 +15,33 @@ import time
 import math
 import psutil
 
-
 import core.mw as mw
 
+def getEnvInfo(self):
+    data = {}
+    data['status'] = True
+    sdir = mw.getServerDir()
+
+    data['webserver'] = '未安装'
+    if os.path.exists(sdir + '/openresty/nginx/sbin/nginx'):
+        data['webserver'] = 'OpenResty'
+    data['php'] = []
+    phpversions = ['52', '53', '54', '55', '56', '70', '71', '72', '73', '74', '80', '81', '82', '83', '84']
+    phpPath = sdir + '/php/'
+    for pv in phpversions:
+        if not os.path.exists(phpPath + pv + '/bin/php'):
+            continue
+        data['php'].append(pv)
+    data['mysql'] = False
+    if os.path.exists(sdir + '/mysql/bin/mysql'):
+        data['mysql'] = True
+    try:
+        diskInfo = psutil.disk_usage('/www')
+    except:
+        diskInfo = psutil.disk_usage('/')
+    data['disk'] = diskInfo[2]
+    return mw.returnData(True, 'ok', data)
+
 def getDiskInfo():
     # 取磁盘分区信息
     temp = mw.execShell("df -h -P|grep '/'|grep -v tmpfs | grep -v devfs")[0]