From b975fedfeefe5ea3c93a907aea7f261757baad02 Mon Sep 17 00:00:00 2001
From: dami <midoks@163.com>
Date: Sat, 11 Apr 2026 21:24:15 +0800
Subject: [PATCH] update

---
 plugins/apache/index.html  |  5 ++--
 plugins/apache/index.py    | 62 ++++++++++++++++++++++---------------------
 plugins/apache/js/httpd.js | 65 ++++++++++++++++++++++++++++++++++++++--------
 3 files changed, 89 insertions(+), 43 deletions(-)

diff --git a/plugins/apache/index.html b/plugins/apache/index.html
index 62a7d71df..3a57b2104 100755
--- a/plugins/apache/index.html
+++ b/plugins/apache/index.html
@@ -5,19 +5,20 @@
 			<p class="bgw" onclick="httpPluginService('apache',$('.plugin_version').attr('version'));">服务</p>
 			<p onclick="pluginInitD('apache', $('.plugin_version').attr('version'));">自启动</p>
 			<p onclick="pluginConfig('apache');">配置修改</p>
-			<p onclick="getOpStatus();">负载状态</p>
+			<p onclick="getHttpdStatus();">负载状态</p>
 			<p onclick="setOpCfg();">性能调整</p>
 			<p onclick="pluginLogs('apache');">错误日志</p>
 			<p onclick="otherFunc();">维护功能</p>
 		</div>
 		<div class="bt-w-con pd15">
-			<div class="soft-man-con"></div>
+			<div class="soft-man-con" style="height: 500px; overflow-y: auto;"></div>
 		</div>
 	</div>
 
 </div>
 
 <script type="text/javascript">
+// resetPluginWinHeight(600);
 $.getScript( "/plugins/file?name=apache&f=js/httpd.js", function(){
 	httpPluginService('apache');
 });
diff --git a/plugins/apache/index.py b/plugins/apache/index.py
index 9cd8f0aa8..4eb0c304b 100755
--- a/plugins/apache/index.py
+++ b/plugins/apache/index.py
@@ -305,16 +305,33 @@ def initdUinstall():
     return 'ok'
 
 def getHttpdStatusPort():
-    conf = mw.getServerDir() + '/httpd/conf/httpd.conf'
+    conf = mw.getServerDir() + '/apache/httpd/conf/httpd.conf'
     content = mw.readFile(conf)
-
-    print(content)
+    if not content:
+        return None
+    rep = r'^\s*Listen\s*(?:\d+\.\d+\.\d+\.\d+:)?(\d+)'  # 匹配非注释行的 Listen 指令，忽略大小写
+    tmp = re.search(rep, content, re.IGNORECASE | re.MULTILINE)
+    if tmp:
+        port = tmp.groups()[0].strip()
+        return port
+    return None
 
 
-    rep = r'listen\s*(.*);'
-    tmp = re.search(rep, content)
-    port =  tmp.groups()[0].strip()
-    return port
+def runInfoDone(data):
+    result = {}
+    if not data:
+        return result
+    
+    # 解析服务器状态数据
+    lines = data.strip().split('\n')
+    for line in lines:
+        if ':' in line:
+            key, value = line.split(':', 1)
+            key = key.strip()
+            value = value.strip()
+            result[key] = value
+    
+    return result
 
 
 def runInfo():
@@ -323,45 +340,30 @@ def runInfo():
         return mw.returnJson(False, "未启动!")
 
     port = getHttpdStatusPort()
+    if not port:
+        return mw.returnJson(False, "无法获取端口信息!")
+    
     # 取Openresty负载状态
     try:
         url = 'http://127.0.0.1:%s/server-status?auto' % port
         result = mw.httpGet(url, timeout=3)
-
-        print(result)
-        tmp = result.split()
-        data = {}
-        data['active'] = tmp[2]
-        data['accepts'] = tmp[9]
-        data['handled'] = tmp[7]
-        data['requests'] = tmp[8]
-        data['Reading'] = tmp[11]
-        data['Writing'] = tmp[13]
-        data['Waiting'] = tmp[15]
+        data = runInfoDone(result)
         return mw.getJson(data)
     except Exception as e:
         try:
             url = 'http://' + mw.getHostAddr() + ':%s/server-status?auto' % port
             result = mw.httpGet(url)
-            tmp = result.split()
-            data = {}
-            data['active'] = tmp[2]
-            data['accepts'] = tmp[9]
-            data['handled'] = tmp[7]
-            data['requests'] = tmp[8]
-            data['Reading'] = tmp[11]
-            data['Writing'] = tmp[13]
-            data['Waiting'] = tmp[15]
+            data = runInfoDone(result)
             return mw.getJson(data)
         except Exception as e:
-            return mw.returnJson(False, "oprenresty异常!")
+            return mw.returnJson(False, "apache异常!")
         
     except Exception as e:
-        return mw.returnJson(False, "oprenresty not started!")
+        return mw.returnJson(False, "apache not started!")
 
 
 def errorLogPath():
-    return getServerDir() + '/nginx/logs/error.log'
+    return getServerDir() + '/httpd/logs/error_log'
 
 
 def getCfg():
diff --git a/plugins/apache/js/httpd.js b/plugins/apache/js/httpd.js
index a6dbefba8..387fa07b2 100755
--- a/plugins/apache/js/httpd.js
+++ b/plugins/apache/js/httpd.js
@@ -110,26 +110,47 @@ function orPluginOpServiceOp(a,b,c,d,a,v,request_callback){
 }
 
 
-//查看Nginx负载状态
-function getOpStatus() {
-    var loadT = layer.msg('正在处理，请稍后...', { icon: 16, time: 0, shade: 0.3 });
+// 定时器变量
+var httpdStatusTimer = null;
+
+//查看Apache负载状态
+function getHttpdStatus() {
     $.post('/plugins/run', {name:'apache', func:'run_info'}, function(data) {
-        layer.close(loadT); 
         try {
             var rdata = $.parseJSON(data.data);
+
+            console.log(rdata);
             if ('status' in rdata && !rdata.status){
                 showMsg(rdata.msg, function(){}, null,3000);
                 return;
             }
 
             var con = "<div><table class='table table-hover table-bordered'>\
-                            <tr><th>活动连接(Active connections)</th><td>" + rdata.active + "</td></tr>\
-                            <tr><th>总连接次数(accepts)</th><td>" + rdata.accepts + "</td></tr>\
-                            <tr><th>总握手次数(handled)</th><td>" + rdata.handled + "</td></tr>\
-                            <tr><th>总请求数(requests)</th><td>" + rdata.requests + "</td></tr>\
-                            <tr><th>请求数(Reading)</th><td>" + rdata.Reading + "</td></tr>\
-                            <tr><th>响应数(Writing)</th><td>" + rdata.Writing + "</td></tr>\
-                            <tr><th>驻留进程(Waiting)</th><td>" + rdata.Waiting + "</td></tr>\
+                            <tr><th>服务器版本(ServerVersion)</th><td>" + (rdata.ServerVersion || '-') + "</td></tr>\
+                            <tr><th>服务器MPM(ServerMPM)</th><td>" + (rdata.ServerMPM || '-') + "</td></tr>\
+                            <tr><th>服务器构建时间(Server Built)</th><td>" + (rdata['Server Built'] || '-') + "</td></tr>\
+                            <tr><th>当前时间(CurrentTime)</th><td>" + (rdata.CurrentTime || '-') + "</td></tr>\
+                            <tr><th>重启时间(RestartTime)</th><td>" + (rdata.RestartTime || '-') + "</td></tr>\
+                            <tr><th>服务器运行时间(ServerUptime)</th><td>" + (rdata.ServerUptime || '-') + "</td></tr>\
+                            <tr><th>服务器运行秒数(ServerUptimeSeconds)</th><td>" + (rdata.ServerUptimeSeconds || '-') + "</td></tr>\
+                            <tr><th>1分钟负载(Load1)</th><td>" + (rdata.Load1 || '-') + "</td></tr>\
+                            <tr><th>5分钟负载(Load5)</th><td>" + (rdata.Load5 || '-') + "</td></tr>\
+                            <tr><th>15分钟负载(Load15)</th><td>" + (rdata.Load15 || '-') + "</td></tr>\
+                            <tr><th>总访问次数(Total Accesses)</th><td>" + (rdata['Total Accesses'] || '-') + "</td></tr>\
+                            <tr><th>总流量(Total kBytes)</th><td>" + (rdata['Total kBytes'] || '-') + " KB</td></tr>\
+                            <tr><th>总请求时间(Total Duration)</th><td>" + (rdata['Total Duration'] || '-') + "</td></tr>\
+                            <tr><th>CPU用户时间(CPUUser)</th><td>" + (rdata.CPUUser || '-') + "</td></tr>\
+                            <tr><th>CPU系统时间(CPUSystem)</th><td>" + (rdata.CPUSystem || '-') + "</td></tr>\
+                            <tr><th>CPU负载(CPULoad)</th><td>" + (rdata.CPULoad || '-') + "</td></tr>\
+                            <tr><th>每秒请求数(ReqPerSec)</th><td>" + (rdata.ReqPerSec || '-') + "</td></tr>\
+                            <tr><th>每秒流量(BytesPerSec)</th><td>" + (rdata.BytesPerSec || '-') + "</td></tr>\
+                            <tr><th>每请求流量(BytesPerReq)</th><td>" + (rdata.BytesPerReq || '-') + "</td></tr>\
+                            <tr><th>每请求时间(DurationPerReq)</th><td>" + (rdata.DurationPerReq || '-') + "</td></tr>\
+                            <tr><th>活动工作进程(BusyWorkers)</th><td>" + (rdata.BusyWorkers || '-') + "</td></tr>\
+                            <tr><th>优雅关闭进程(GracefulWorkers)</th><td>" + (rdata.GracefulWorkers || '-') + "</td></tr>\
+                            <tr><th>空闲工作进程(IdleWorkers)</th><td>" + (rdata.IdleWorkers || '-') + "</td></tr>\
+                            <tr><th>进程数(Processes)</th><td>" + (rdata.Processes || '-') + "</td></tr>\
+                            <tr><th>总连接数(ConnsTotal)</th><td>" + (rdata.ConnsTotal || '-') + "</td></tr>\
                          </table></div>";
             $(".soft-man-con").html(con);
         }catch(err){
@@ -138,6 +159,28 @@ function getOpStatus() {
     },'json');
 }
 
+// 启动自动刷新
+function startHttpdStatusAutoRefresh() {
+    // 先清除现有的定时器
+    if (httpdStatusTimer) {
+        clearInterval(httpdStatusTimer);
+    }
+    
+    // 立即执行一次
+    getHttpdStatus();
+    
+    // 设置定时器，每5秒刷新一次
+    httpdStatusTimer = setInterval(getHttpdStatus, 5000);
+}
+
+// 停止自动刷新
+function stopHttpdStatusAutoRefresh() {
+    if (httpdStatusTimer) {
+        clearInterval(httpdStatusTimer);
+        httpdStatusTimer = null;
+    }
+}
+
 
 function setOpCfg(){
     httpPost('get_cfg', {}, function(data){