Merge pull request #181 from midoks/dev

0.9.7

.github/workflows/python-app-mysql55.yml

@@ -5,9 +5,9 @@ name: MW APP MySQL55
 
 on:
   push:
-    branches: [ "master" ]
+    branches: [ "run_test" ]
   pull_request:
-    branches: [ "master" ]
+    branches: [ "run_test" ]
 
 permissions:
   contents: read

.github/workflows/python-app-mysql56.yml

@@ -5,9 +5,9 @@ name: MW APP MySQL56
 
 on:
   push:
-    branches: [ "master" ]
+    branches: [ "run_test" ]
   pull_request:
-    branches: [ "master" ]
+    branches: [ "run_test" ]
 
 permissions:
   contents: read

.github/workflows/python-app-mysql57.yml

@@ -5,9 +5,9 @@ name: MW APP MySQL57
 
 on:
   push:
-    branches: [ "master" ]
+    branches: [ "run_test" ]
   pull_request:
-    branches: [ "master" ]
+    branches: [ "run_test" ]
 
 permissions:
   contents: read

.github/workflows/python-app-mysql80.yml

@@ -5,9 +5,9 @@ name: MW APP MySQL80
 
 on:
   push:
-    branches: [ "master" ]
+    branches: [ "run_test" ]
   pull_request:
-    branches: [ "master" ]
+    branches: [ "run_test" ]
 
 permissions:
   contents: read

.github/workflows/python-app-php.yml

@@ -5,9 +5,9 @@ name: MW APP PHP
 
 on:
   push:
-    branches: [ "master" ]
+    branches: [ "run_test" ]
   pull_request:
-    branches: [ "master" ]
+    branches: [ "run_test" ]
 
 permissions:
   contents: read

.gitignore

@@ -141,6 +141,7 @@ data/restart.pl
 data/ssl.pl
 data/edate.pl
 data/osname.pl
+data/only_netio_counters.pl
 data/system.db-journal
 data/hook_*.json
 
@@ -153,3 +154,4 @@ plugins/bk_demo
 debug.out
 
 
+

README.md

@@ -1,4 +1,4 @@
-### mdserver-web 0.9.6
+### mdserver-web 0.9.7
 
 简单的Linux面板,感谢BT.CN写出如此好的web管理软件。我一看到，就知道这是我一直想要的页面化管理方式。
 复制了后台管理界面，按照自己想要的方式写了一版。
@@ -71,12 +71,10 @@ docker run -itd --name mw-server --privileged=true -p 7200:7200 -p 80:80 -p 443:
 ```
 
 
-### 版本更新 0.9.6
-
-* 增加插件备份功能.
-* supervisor增加错误日志查看.
-* MariaDB安装源优化.
+### 版本更新 0.9.7
 
+* haproxy插件添加.
+* 细节优化.
 
 ### JSDelivr安装地址
 

class/core/config_api.py

@@ -15,7 +15,7 @@ from flask import request
 
 class config_api:
 
-    __version = '0.9.5'
+    __version = '0.9.7'
 
     def __init__(self):
         pass

class/core/mw.py

@@ -650,16 +650,14 @@ def getLocalIp():
     try:
         ipaddress = readFile(filename)
         if not ipaddress or ipaddress == '127.0.0.1':
-            raise Exception("ip is empty!")
+            cmd = "curl -4 -sS --connect-timeout 5 -m 60 https://v6r.ipip.net/?format=text"
+            ip = execShell(cmd)
+            result = ip[0].strip()
+            if result == '':
+                raise Exception("ipv4 is empty!")
+            writeFile(filename, result)
+            return result
         return ipaddress
-    except Exception as e:
-        cmd = "curl -4 -sS --connect-timeout 5 -m 60 https://v6r.ipip.net/?format=text"
-        ip = execShell(cmd)
-        result = ip[0].strip()
-        if result == '':
-            raise e
-        writeFile(filename, result)
-        return result
     except Exception as e:
         cmd = "curl -6 -sS --connect-timeout 5 -m 60 https://v6r.ipip.net/?format=text"
         ip = execShell(cmd)
@@ -668,6 +666,8 @@ def getLocalIp():
             return '127.0.0.1'
         writeFile(filename, result)
         return result
+    finally:
+        pass
     return '127.0.0.1'
 
 

class/core/system_api.py

@@ -437,12 +437,35 @@ class system_api:
         os.system('echo > /tmp/panelBoot.pl')
         return total, count
 
+    def psutilNetIoCounters(self):
+        '''
+        统计网卡流量
+        '''
+        stat_pl = 'data/only_netio_counters.pl'
+        if os.path.exists(stat_pl):
+            local_lo = (0, 0, 0, 0)
+            ioName = psutil.net_io_counters(pernic=True).keys()
+            for x in ioName:
+
+                if x.find("lo") > -1:
+                    local_lo = psutil.net_io_counters(
+                        pernic=True).get(x)[:4]
+
+            all_io = psutil.net_io_counters()[:4]
+            result_io = tuple([all_io[i] - local_lo[i]
+                               for i in range(0, len(all_io))])
+
+            # print(local_lo)
+            # print(all_io)
+            # print(result_io)
+            return result_io
+        return psutil.net_io_counters()[:4]
+
     def getNetWork(self):
-        # return self.GetNetWorkApi(get);
         # 取网络流量信息
         try:
             # 取网络流量信息
-            networkIo = psutil.net_io_counters()[:4]
+            networkIo = self.psutilNetIoCounters()
             if not "otime" in session:
                 session['up'] = networkIo[0]
                 session['down'] = networkIo[1]
@@ -470,38 +493,7 @@ class system_api:
 
             return networkInfo
         except Exception as e:
-            # print(e)
-            return None
-
-    def getNetWorkApi(self):
-        # 取网络流量信息
-        try:
-            tmpfile = 'data/network.temp'
-            networkIo = psutil.net_io_counters()[:4]
-
-            if not os.path.exists(tmpfile):
-                mw.writeFile(tmpfile, str(
-                    networkIo[0]) + '|' + str(networkIo[1]) + '|' + str(int(time.time())))
-
-            lastValue = mw.readFile(tmpfile).split('|')
-
-            ntime = time.time()
-            networkInfo = {}
-            networkInfo['upTotal'] = networkIo[0]
-            networkInfo['downTotal'] = networkIo[1]
-            networkInfo['up'] = round(
-                float(networkIo[0] - int(lastValue[0])) / 1024 / (ntime - int(lastValue[2])), 2)
-            networkInfo['down'] = round(
-                float(networkIo[1] - int(lastValue[1])) / 1024 / (ntime - int(lastValue[2])), 2)
-            networkInfo['downPackets'] = networkIo[3]
-            networkInfo['upPackets'] = networkIo[2]
-
-            mw.writeFile(tmpfile, str(
-                networkIo[0]) + '|' + str(networkIo[1]) + '|' + str(int(time.time())))
-
-            # networkInfo['cpu'] = self.GetCpuInfo(0.1)
-            return networkInfo
-        except:
+            print("getNetWork error:", e)
             return None
 
     def getNetWorkIoData(self, start, end):
@@ -567,14 +559,19 @@ class system_api:
     def setControl(self, stype, day):
 
         filename = 'data/control.conf'
+        stat_pl = 'data/only_netio_counters.pl'
 
         if stype == '0':
-            mw.execShell("rm -f " + filename)
+            mw.execShell("rm -rf " + filename)
         elif stype == '1':
             _day = int(day)
             if _day < 1:
                 return mw.returnJson(False, "设置失败!")
             mw.writeFile(filename, day)
+        elif stype == '2':
+            mw.execShell("rm -rf " + stat_pl)
+        elif stype == '3':
+            mw.execShell("echo 'True' > " + stat_pl)
         elif stype == 'del':
             if not mw.isRestart():
                 return mw.returnJson(False, '请等待所有安装任务完成再执行')
@@ -597,6 +594,12 @@ class system_api:
             else:
                 data['day'] = 30
                 data['status'] = False
+
+            if os.path.exists(stat_pl):
+                data['stat_all_status'] = True
+            else:
+                data['stat_all_status'] = False
+
             return mw.getJson(data)
 
         return mw.returnJson(True, "设置成功!")

plugins/haproxy/conf/haproxy.conf

@@ -0,0 +1,37 @@
+global
+	daemon
+	log            		127.0.0.1 local0
+	pidfile        		/tmp/haproxy.pid
+	maxconn        		4000
+	user           		haproxy
+	group          		haproxy
+
+
+defaults
+	mode				http
+	log					global
+	option				httplog
+	timeout	connect		10s
+	timeout client		15s
+	timeout	server		15s
+
+
+listen stats
+	mode http
+	bind *:10800
+	stats enable
+	stats uri /haproxy
+	stats realm Haproxy\ Statistics
+	stats auth admin:admin
+
+frontend http-in
+	bind *:1080
+	default_backend		servers
+	option				forwardfor
+	option 				httpclose
+
+backend servers
+	balance roundrobin
+	server web1 0.0.0.0:9090 check
+
+

plugins/haproxy/index.html

@@ -0,0 +1,18 @@
+<div class="bt-form">
+	<div class="bt-w-main">
+		<div class="bt-w-menu">
+			<p class="bgw" onclick="pluginService('haproxy');">服务</p>
+			<p onclick="pluginInitD('haproxy');">自启动</p>
+			<p onclick="pluginConfigTpl('haproxy');">配置修改</p>
+			<p onclick="pluginLogs('haproxy','','run_log',30);">运行日志</p>
+		</div>
+		<div class="bt-w-con pd15">
+			<div class="soft-man-con"></div>
+		</div>
+	</div>
+</div>
+<script type="text/javascript">
+$.getScript( "/plugins/file?name=haproxy&f=js/haproxy.js", function(){
+	pluginService('haproxy');
+});
+</script>

plugins/haproxy/index.py

@@ -0,0 +1,253 @@
+# coding:utf-8
+
+import sys
+import io
+import os
+import time
+import re
+import string
+import subprocess
+
+sys.path.append(os.getcwd() + "/class/core")
+import mw
+
+app_debug = False
+if mw.isAppleSystem():
+    app_debug = True
+
+
+def getPluginName():
+    return 'haproxy'
+
+
+def getPluginDir():
+    return mw.getPluginDir() + '/' + getPluginName()
+
+
+def getServerDir():
+    return mw.getServerDir() + '/' + getPluginName()
+
+
+def getInitDFile():
+    if app_debug:
+        return '/tmp/' + getPluginName()
+    return '/etc/init.d/' + getPluginName()
+
+
+def getConfTpl():
+    path = getPluginDir() + "/conf/haproxy.conf"
+    return path
+
+
+def getConf():
+    path = getServerDir() + "/haproxy.conf"
+    return path
+
+
+def getInitDTpl():
+    path = getPluginDir() + "/init.d/" + getPluginName() + ".tpl"
+    return path
+
+
+def getArgs():
+    args = sys.argv[2:]
+    tmp = {}
+    args_len = len(args)
+
+    if args_len == 1:
+        t = args[0].strip('{').strip('}')
+        t = t.split(':')
+        tmp[t[0]] = t[1]
+    elif args_len > 1:
+        for i in range(len(args)):
+            t = args[i].split(':')
+            tmp[t[0]] = t[1]
+    return tmp
+
+
+def checkArgs(data, ck=[]):
+    for i in range(len(ck)):
+        if not ck[i] in data:
+            return (False, mw.returnJson(False, '参数:(' + ck[i] + ')没有!'))
+    return (True, mw.returnJson(True, 'ok'))
+
+
+def configTpl():
+    path = getPluginDir() + '/tpl'
+    pathFile = os.listdir(path)
+    tmp = []
+    for one in pathFile:
+        file = path + '/' + one
+        tmp.append(file)
+    return mw.getJson(tmp)
+
+
+def readConfigTpl():
+    args = getArgs()
+    data = checkArgs(args, ['file'])
+    if not data[0]:
+        return data[1]
+
+    content = mw.readFile(args['file'])
+    content = contentReplace(content)
+    return mw.returnJson(True, 'ok', content)
+
+
+def contentReplace(content):
+    service_path = mw.getServerDir()
+    content = content.replace('{$ROOT_PATH}', mw.getRootDir())
+    content = content.replace('{$SERVER_PATH}', service_path)
+    content = content.replace('{$SERVER_APP}', service_path + '/haproxy')
+    return content
+
+
+def status():
+    data = mw.execShell(
+        "ps -ef|grep haproxy |grep -v grep | grep -v python | awk '{print $2}'")
+    if data[0] == '':
+        return 'stop'
+    return 'start'
+
+
+def initDreplace():
+
+    file_tpl = getInitDTpl()
+    service_path = os.path.dirname(os.getcwd())
+
+    initD_path = getServerDir() + '/init.d'
+    if not os.path.exists(initD_path):
+        os.mkdir(initD_path)
+    file_bin = initD_path + '/' + getPluginName()
+
+    # initd replace
+    if not os.path.exists(file_bin):
+        content = mw.readFile(file_tpl)
+        content = contentReplace(content)
+        mw.writeFile(file_bin, content)
+        mw.execShell('chmod +x ' + file_bin)
+
+    # config replace
+    conf_bin = getConf()
+    if not os.path.exists(conf_bin):
+        conf_content = mw.readFile(getConfTpl())
+        conf_content = contentReplace(conf_content)
+        mw.writeFile(getServerDir() + '/haproxy.conf', conf_content)
+
+    # systemd
+    systemDir = mw.systemdCfgDir()
+    systemService = systemDir + '/haproxy.service'
+    systemServiceTpl = getPluginDir() + '/init.d/haproxy.service.tpl'
+    if os.path.exists(systemDir) and not os.path.exists(systemService):
+        service_path = mw.getServerDir()
+        se_content = mw.readFile(systemServiceTpl)
+        se_content = se_content.replace('{$SERVER_PATH}', service_path)
+        mw.writeFile(systemService, se_content)
+        mw.execShell('systemctl daemon-reload')
+
+    return file_bin
+
+
+def haOp(method):
+    file = initDreplace()
+
+    if not mw.isAppleSystem():
+        data = mw.execShell('systemctl ' + method + ' haproxy')
+        if data[1] == '':
+            return 'ok'
+        return 'fail'
+
+    data = mw.execShell(file + ' ' + method)
+    if data[1] == '':
+        return 'ok'
+    return data[1]
+
+
+def start():
+    return haOp('start')
+
+
+def stop():
+    return haOp('stop')
+
+
+def restart():
+    return haOp('restart')
+
+
+def reload():
+    return haOp('reload')
+
+
+def initdStatus():
+    if mw.isAppleSystem():
+        return "Apple Computer does not support"
+
+    shell_cmd = 'systemctl status haproxy | grep loaded | grep "enabled;"'
+    data = mw.execShell(shell_cmd)
+    if data[0] == '':
+        return 'fail'
+    return 'ok'
+
+
+def initdInstall():
+    if mw.isAppleSystem():
+        return "Apple Computer does not support"
+
+    mw.execShell('systemctl enable haproxy')
+    return 'ok'
+
+
+def initdUinstall():
+    if mw.isAppleSystem():
+        return "Apple Computer does not support"
+
+    mw.execShell('systemctl disable haproxy')
+    return 'ok'
+
+
+def runLog():
+    path = getConf()
+    content = mw.readFile(path)
+    rep = 'log\s*=\s*(.*)'
+    tmp = re.search(rep, content)
+    return tmp.groups()[0]
+
+
+def getPort():
+    path = getConf()
+    content = mw.readFile(path)
+    rep = 'listen\s*=\s*(.*)'
+    tmp = re.search(rep, content)
+    return tmp.groups()[0]
+
+
+if __name__ == "__main__":
+    func = sys.argv[1]
+    if func == 'status':
+        print(status())
+    elif func == 'start':
+        print(start())
+    elif func == 'stop':
+        print(stop())
+    elif func == 'restart':
+        print(restart())
+    elif func == 'reload':
+        print(reload())
+    elif func == 'initd_status':
+        print(initdStatus())
+    elif func == 'initd_install':
+        print(initdInstall())
+    elif func == 'initd_uninstall':
+        print(initdUinstall())
+    elif func == 'conf':
+        print(getConf())
+    elif func == 'config_tpl':
+        print(configTpl())
+    elif func == 'read_config_tpl':
+        print(readConfigTpl())
+    elif func == 'run_log':
+        print(runLog())
+    elif func == 'query_log':
+        print(queryLog())
+    else:
+        print('error')

plugins/haproxy/info.json

@@ -0,0 +1,19 @@
+{
+	"sort": 7,
+	"ps": "可靠、高性能的TCP/HTTP负载平衡器",
+	"name": "haproxy",
+	"title": "haproxy",
+	"shell": "install.sh",
+	"versions":["2.6"],
+	"updates":["2.6"],
+	"tip": "soft",
+	"checks": "server/haproxy",
+	"path": "server/haproxy",
+	"display": 1,
+	"author": "midoks",
+	"date": "2022-08-26",
+	"home": "https://www.haproxy.org/",
+	"doc1": "https://www.haproxy.org/",
+	"type": 0,
+	"pid": "4"
+}

plugins/haproxy/init.d/haproxy.service.tpl

@@ -0,0 +1,13 @@
+[Unit]
+Description=he Reliable, High Performance TCP/HTTP Load Balancer
+After=network.target
+
+[Service]
+Type=forking
+ExecStartPre={$SERVER_PATH}/haproxy/sbin/haproxy -c -f {$SERVER_PATH}/haproxy/haproxy.conf
+ExecStart={$SERVER_PATH}/haproxy/sbin/haproxy -D -f {$SERVER_PATH}/haproxy/haproxy.conf
+ExecReload={$SERVER_PATH}/haproxy/sbin/haproxy -f {$SERVER_PATH}/haproxy/haproxy.conf -c -q
+Restart=on-failure
+
+[Install]
+WantedBy=multi-user.target

plugins/haproxy/init.d/haproxy.tpl

@@ -0,0 +1,119 @@
+#!/bin/sh
+# 
+# chkconfig: - 85 15
+# description: HA-Proxy is a TCP/HTTP reverse proxy which is particularly suited \
+#              for high availability environments.
+# processname: haproxy
+# config: /etc/haproxy/haproxy.cfg
+# pidfile: /var/run/haproxy.pid
+# Script Author: Simon Matter <simon.matter@invoca.ch>
+# Version: 2004060600
+# Source function library.
+ 
+if [ -f /etc/init.d/functions ]; then
+  . /etc/init.d/functions
+elif [ -f /etc/rc.d/init.d/functions ] ; then
+  . /etc/rc.d/init.d/functions
+else
+  echo ".."
+fi
+ 
+# Source networking configuration.
+if [ -f /etc/sysconfig/network ];then
+  . /etc/sysconfig/network
+fi
+
+# Check that networking is up.
+# [ ${NETWORKING} = "no" ] && exit 0
+
+HAPROXYDIR={$SERVER_PATH}/haproxy
+BASENAME=haproxy
+ 
+# This is our service name
+ 
+#BASENAME=`basename $0`
+#if [ -L $0 ]; then
+#  BASENAME=`find $0 -name $BASENAME -printf %l`
+#  BASENAME=`basename $BASENAME`
+#fi
+ 
+[ -f $HAPROXYDIR/etc/$BASENAME.conf ] || exit 1
+ 
+RETVAL=0
+ 
+start() {
+    $HAPROXYDIR/sbin/$BASENAME -c -q -f $HAPROXYDIR/etc/$BASENAME.conf
+
+
+    if [ $? -ne 0 ]; then
+    echo "Errors found in configuration file, check it with '$BASENAME check'."
+    return 1
+    fi
+
+    echo -n "Starting $BASENAME: "
+    daemon $HAPROXYDIR/sbin/$BASENAME -D -f $HAPROXYDIR/etc/$BASENAME.conf
+    RETVAL=$?
+    # echo
+    # [ $RETVAL -eq 0 ] && touch /var/lock/subsys/$BASENAME
+    return $RETVAL
+}
+ 
+ 
+stop() {
+ 
+  echo -n "Shutting down $BASENAME: "
+  killproc $BASENAME -USR1
+
+  RETVAL=$?
+  echo
+  [ $RETVAL -eq 0 ] && rm -f /var/lock/subsys/$BASENAME
+  [ $RETVAL -eq 0 ] && rm -f /var/run/$BASENAME.pid
+  return $RETVAL
+}
+ 
+restart() {
+  $HAPROXYDIR/sbin/$BASENAME -c -q -f $HAPROXYDIR/etc/$BASENAME.conf
+  if [ $? -ne 0 ]; then
+    echo "Errors found in configuration file, check it with '$BASENAME check'."
+    return 1
+  fi
+  stop
+  start
+}
+ 
+reload() {
+  $HAPROXYDIR/sbin/$BASENAME -c -q -f $HAPROXYDIR/etc/$BASENAME.conf
+  if [ $? -ne 0 ]; then
+    echo "Errors found in configuration file, check it with '$BASENAME check'."
+    return 1
+  fi
+  $HAPROXYDIR/sbin/$BASENAME -D -f $HAPROXYDIR/$BASENAME.conf -p /var/run/$BASENAME.pid -sf $(cat /var/run/$BASENAME.pid)
+}
+ 
+check() {
+  $HAPROXYDIR/sbin/$BASENAME -c -q -V -f $HAPROXYDIR/etc/$BASENAME.conf
+}
+ 
+rhstatus() {
+  status $BASENAME
+}
+ 
+condrestart() {
+  [ -e /var/lock/subsys/$BASENAME ] && restart || :
+}
+ 
+# See how we were called.
+case "$1" in
+  start) start ;;
+  stop) stop ;;
+  restart) restart;;
+  reload) reload;;
+  condrestart) condrestart ;;
+  status) rhstatus ;;
+  check) check ;;
+  *)
+    echo $"Usage: $BASENAME {start|stop|restart|reload|condrestart|status|check}"
+    exit 1
+esac
+ 
+exit $?

plugins/haproxy/install.sh

@@ -0,0 +1,52 @@
+#!/bin/bash
+PATH=/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin:~/bin
+export PATH
+
+curPath=`pwd`
+rootPath=$(dirname "$curPath")
+rootPath=$(dirname "$rootPath")
+serverPath=$(dirname "$rootPath")
+install_tmp=${rootPath}/tmp/mw_install.pl
+
+
+action=$1
+type=$2
+
+echo $action $type
+
+if id haproxy &> /dev/null ;then 
+    echo "haproxy UID is `id -u haproxy`"
+    echo "haproxy Shell is `grep "^haproxy:" /etc/passwd |cut -d':' -f7 `"
+else
+    groupadd haproxy
+	useradd -g haproxy haproxy
+fi
+
+if [ "${2}" == "" ];then
+	echo '缺少安装脚本...' > $install_tmp
+	exit 0
+fi 
+
+if [ ! -d $curPath/versions/$2 ];then
+	echo '缺少安装脚本2...' > $install_tmp
+	exit 0
+fi
+
+if [ "${action}" == "uninstall" ];then
+	
+	if [ -f /usr/lib/systemd/system/haproxy.service ] || [ -f /lib/systemd/system/haproxy.service ];then
+		systemctl stop haproxy
+		systemctl disable haproxy
+		rm -rf /usr/lib/systemd/system/haproxy.service
+		rm -rf /lib/systemd/system/haproxy.service
+		systemctl daemon-reload
+	fi
+fi
+
+sh -x $curPath/versions/$2/install.sh $1
+
+if [ "${action}" == "install" ] && [ -d $serverPath/haproxy ];then
+	#初始化 
+	cd ${rootPath} && python3 ${rootPath}/plugins/haproxy/index.py start ${type}
+	cd ${rootPath} && python3 ${rootPath}/plugins/haproxy/index.py initd_install ${type}
+fi

plugins/haproxy/js/haproxy.js

@@ -0,0 +1,53 @@
+function spPostMin(method, args, callback){
+
+    var req_data = {};
+    req_data['name'] = 'haproxy';
+    req_data['func'] = method;
+ 
+    if (typeof(args) != 'undefined' && args!=''){
+        req_data['args'] = JSON.stringify(args);
+    }
+
+    $.post('/plugins/run', req_data, function(data) {
+        if (!data.status){
+            layer.msg(data.msg,{icon:0,time:2000,shade: [0.3, '#000']});
+            return;
+        }
+
+        if(typeof(callback) == 'function'){
+            callback(data);
+        }
+    },'json'); 
+}
+
+function spPost(method, args, callback){
+    var loadT = layer.msg('正在获取...', { icon: 16, time: 0, shade: 0.3 });
+    spPostMin(method,args,function(data){
+        layer.close(loadT);
+        if(typeof(callback) == 'function'){
+            callback(data);
+        } 
+    });
+}
+
+
+function secToTime(s) {
+    var t;
+    if(s > -1){
+        var hour = Math.floor(s/3600);
+        var min = Math.floor(s/60) % 60;
+        var sec = s % 60;
+        if(hour < 10) {
+            t = '0'+ hour + ":";
+        } else {
+            t = hour + ":";
+        }
+
+        if(min < 10){t += "0";}
+        t += min + ":";
+        if(sec < 10){t += "0";}
+        t += sec.toFixed(2);
+    }
+    return t;
+}
+

plugins/haproxy/versions/2.6/install.sh

@@ -0,0 +1,70 @@
+#!/bin/bash
+PATH=/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin:~/bin
+export PATH
+
+curPath=`pwd`
+rootPath=$(dirname "$curPath")
+rootPath=$(dirname "$rootPath")
+serverPath=$(dirname "$rootPath")
+sysName=`uname`
+
+install_tmp=${rootPath}/tmp/mw_install.pl
+
+
+bash ${rootPath}/scripts/getos.sh
+OSNAME=`cat ${rootPath}/data/osname.pl`
+OSNAME_ID=`cat /etc/*-release | grep VERSION_ID | awk -F = '{print $2}' | awk -F "\"" '{print $2}'`
+
+
+VERSION=2.6.4
+MIN_VERSION=2.6
+Install_App()
+{
+
+	echo '正在安装脚本文件...' > $install_tmp
+	mkdir -p $serverPath/haproxy
+
+	APP_DIR=${serverPath}/source/haproxy
+	mkdir -p $APP_DIR
+	
+	if [ ! -f ${APP_DIR}/haproxy-${VERSION}.tar.gz ];then
+		if [ $sysName == 'Darwin' ]; then
+			wget -O ${APP_DIR}/haproxy-${VERSION}.tar.gz https://www.haproxy.org/download/${MIN_VERSION}/src/haproxy-${VERSION}.tar.gz
+		else
+			curl -sSLo ${APP_DIR}/haproxy-${VERSION}.tar.gz https://www.haproxy.org/download/${MIN_VERSION}/src/haproxy-${VERSION}.tar.gz
+		fi
+	fi
+
+	if [ ! -f ${APP_DIR}/haproxy-${VERSION}.tar.gz ];then
+		curl -sSLo ${APP_DIR}/haproxy-${VERSION}.tar.gz https://www.haproxy.org/download/${MIN_VERSION}/src/haproxy-${VERSION}.tar.gz
+	fi
+
+
+	cd ${APP_DIR} && tar -zxvf haproxy-${VERSION}.tar.gz
+
+	if [ "$OSNAME" == "macos" ];then
+		cd ${APP_DIR}/haproxy-${VERSION} && make TARGET=osx && make install PREFIX=$serverPath/haproxy
+	else
+		cd ${APP_DIR}/haproxy-${VERSION} && make TARGET=linux-glibc && make install PREFIX=$serverPath/haproxy
+	fi
+
+	echo $MIN_VERSION > $serverPath/haproxy/version.pl
+	echo 'Install_HA' > $install_tmp
+}
+
+Uninstall_App()
+{
+	if [ -f $serverPath/haproxy/initd/haproxy ];then
+		$serverPath/haproxy/initd/haproxy stop
+	fi
+
+	rm -rf $serverPath/haproxy
+	echo "Uninstall_HA" > $install_tmp
+}
+
+action=$1
+if [ "${1}" == 'install' ];then
+	Install_App
+else
+	Uninstall_App
+fi

plugins/mongodb/install.sh

@@ -21,14 +21,26 @@ OSNAME=`cat ${rootPath}/data/osname.pl`
 SYS_VERSION_ID=`cat /etc/*-release | grep VERSION_ID | awk -F = '{print $2}' | awk -F "\"" '{print $2}'`
 
 
+
+
+
+
+
 Install_app_mac()
 {
-	if [ ! -f $serverPath/source/mongodb-macos-x86_64-${VERSION}.tgz ];then
-		wget -O $serverPath/source/mongodb-macos-x86_64-${VERSION}.tgz https://fastdl.mongodb.org/osx/mongodb-macos-x86_64-${VERSION}.tgz
+	mkdir -p $serverPath/mongodb
+	if [ "$VERSION" == "5.0" ];then
+		G_VERSION="5.0.11"
+	elif [[ "$VERSION" == "4.4" ]]; then
+		G_VERSION="4.4.11"
 	fi
 
-	cd $serverPath/source && tar -zxvf mongodb-macos-x86_64-${VERSION}.tgz
-	cd  mongodb-macos-x86_64-${VERSION} && mv  ./* $serverPath/mongodb
+	if [ ! -f $serverPath/source/mongodb-macos-x86_64-${G_VERSION}.tgz ];then
+		wget -O $serverPath/source/mongodb-macos-x86_64-${G_VERSION}.tgz https://fastdl.mongodb.org/osx/mongodb-macos-x86_64-${G_VERSION}.tgz
+	fi
+
+	cd $serverPath/source && tar -zxvf mongodb-macos-x86_64-${G_VERSION}.tgz
+	cd  mongodb-macos-x86_64-${G_VERSION} && mv  ./* $serverPath/mongodb
 }
 
 

plugins/php/versions/80/install.sh

@@ -16,7 +16,7 @@ function version_lt() { test "$(echo "$@" | tr " " "\n" | sort -rV | head -n 1)"
 function version_ge() { test "$(echo "$@" | tr " " "\n" | sort -rV | head -n 1)" == "$1"; }
 
 
-version=8.0.21
+version=8.0.22
 PHP_VER=80
 Install_php()
 {

plugins/php/versions/81/install.sh

@@ -16,7 +16,7 @@ function version_lt() { test "$(echo "$@" | tr " " "\n" | sort -rV | head -n 1)"
 function version_ge() { test "$(echo "$@" | tr " " "\n" | sort -rV | head -n 1)" == "$1"; }
 
 
-version=8.1.8
+version=8.1.9
 PHP_VER=81
 Install_php()
 {

plugins/php/versions/82/install.sh

@@ -16,7 +16,7 @@ function version_lt() { test "$(echo "$@" | tr " " "\n" | sort -rV | head -n 1)"
 function version_ge() { test "$(echo "$@" | tr " " "\n" | sort -rV | head -n 1)" == "$1"; }
 
 
-version=8.2.0alpha2
+version=8.2.0beta3
 PHP_VER=82
 Install_php()
 {

plugins/rsyncd/index.py

@@ -135,11 +135,12 @@ def initDReceive():
         mw.writeFile(file_bin, content)
         mw.execShell('chmod +x ' + file_bin)
 
+    lock_file = getServerDir() + "/installed_rsyncd.pl"
     # systemd
     systemDir = mw.systemdCfgDir()
     systemService = systemDir + '/rsyncd.service'
     systemServiceTpl = getPluginDir() + '/init.d/rsyncd.service.tpl'
-    if os.path.exists(systemDir) and not os.path.exists(systemService):
+    if not os.path.exists(lock_file):
         rsync_bin = mw.execShell('which rsync')[0].strip()
         if rsync_bin == '':
             print('rsync missing!')
@@ -152,6 +153,8 @@ def initDReceive():
         mw.writeFile(systemService, se)
         mw.execShell('systemctl daemon-reload')
 
+        mw.writeFile(lock_file, "ok")
+
     rlog = getLog()
     if os.path.exists(rlog):
         mw.writeFile(rlog, '')
@@ -199,7 +202,7 @@ def initDSend():
         mw.writeFile(systemService, content)
         mw.execShell('systemctl daemon-reload')
 
-    mw.writeFile(lock_file, "ok")
+        mw.writeFile(lock_file, "ok")
 
     lslog = getLsyncdLog()
     if os.path.exists(lslog):

route/static/app/control.js

@@ -77,7 +77,7 @@ $(".networkbtn").click(function(){
 function Wday(day,name){
 	var now = (new Date().getTime())/1000;
 	if(day==0){
-		var b = (new Date(GetToday() + " 00:00:01").getTime())/1000;
+		var b = (new Date(getToday() + " 00:00:01").getTime())/1000;
 			b = Math.round(b);
 		var e = Math.round(now);
 	}
@@ -111,7 +111,7 @@ function Wday(day,name){
 	}
 }
 
-function GetToday(){
+function getToday(){
    var mydate = new Date();
    var str = "" + mydate.getFullYear() + "/";
    str += (mydate.getMonth()+1) + "/";
@@ -123,30 +123,51 @@ function GetToday(){
 function getStatus(){
 	loadT = layer.msg('正在读取,请稍候...',{icon:16,time:0})
 	$.post('/system/set_control','type=-1',function(rdata){
-		// console.log(rdata);
 		layer.close(loadT);
+
 		if(rdata.status){
-			$("#openJK").html("<input class='btswitch btswitch-ios' id='ctswitch' type='checkbox' checked><label class='btswitch-btn' for='ctswitch' onclick='setControl()'></label>")
+			$("#openJK").html("<input class='btswitch btswitch-ios' id='ctswitch' type='checkbox' checked><label class='btswitch-btn' for='ctswitch' onclick='setControl(\"openjk\", true)'></label>");
+		} else {
+			$("#openJK").html("<input class='btswitch btswitch-ios' id='ctswitch' type='checkbox'><label class='btswitch-btn' for='ctswitch' onclick='setControl(\"openjk\",false)'></label>");
 		}
-		else{
-			$("#openJK").html("<input class='btswitch btswitch-ios' id='ctswitch' type='checkbox'><label class='btswitch-btn' for='ctswitch' onclick='setControl()'></label>")
+
+		if(rdata.stat_all_status){
+			$("#statAll").html("<input class='btswitch btswitch-ios' id='stat_witch' type='checkbox' checked><label class='btswitch-btn' for='stat_witch' onclick='setControl(\"stat\",true)'></label>");
+		} else{
+			$("#statAll").html("<input class='btswitch btswitch-ios' id='stat_witch' type='checkbox'><label class='btswitch-btn' for='stat_witch' onclick='setControl(\"stat\",false)'></label>");
 		}
-		$("#saveDay").val(rdata.day)
+
+		$("#save_day").val(rdata.day);
+
 	},'json');
 }
 getStatus();
 
 //设置监控状态
-function setControl(act){
-	var day = $("#saveDay").val()
-	if(day < 1){
-		layer.msg('保存天数不合法!',{icon:2});
-		return;
-	}
-	if(act){
-		var type = $("#ctswitch").prop('checked')?'1':'0';
-	}else{
+function setControl(act, value=false){
+
+	if (act == 'openjk'){
 		var type = $("#ctswitch").prop('checked')?'0':'1';
+		var day = $("#save_day").val();
+		if(day < 1){
+			layer.msg('保存天数不合法!',{icon:2});
+			return;
+		}
+	} else if (act == 'stat'){
+		var type = $("#stat_witch").prop('checked')?'2':'3';
+	} else if (act == 'save_day'){
+		var type = $("#ctswitch").prop('checked')?'1':'0';
+		var day = $("#save_day").val();
+
+		if(type == 0){
+			layer.msg('先开启监控!',{icon:2});
+			return;
+		}
+
+		if(day < 1){
+			layer.msg('保存天数不合法!',{icon:2});
+			return;
+		}
 	}
 	
 	loadT = layer.msg('正在处理,请稍候...',{icon:16,time:0})
@@ -156,13 +177,13 @@ function setControl(act){
 	},'json');
 }
 
+
 //清理记录
 function closeControl(){
 	layer.confirm('您真的清空所有监控记录吗？',{title:'清空记录',icon:3,closeBtn:2}, function() {
 		loadT = layer.msg('正在处理,请稍候...',{icon:16,time:0})
 		$.post('/system/set_control','type=del',function(rdata){
 			layer.close(loadT);
-			// $.get('/system?action=ReWeb',function(){});
 			layer.msg(rdata.msg,{icon:rdata.status?1:2});
 		},'json');
 	});

route/templates/default/control.html

@@ -13,20 +13,26 @@
 				<div class="mr50 pull-left">
 					<div class="ss-text pull-left">
 						<em>开启监控</em>
-						<div class='ssh-item' id="openJK">
-						</div>
+						<div class='ssh-item' id="openJK"></div>
 					</div>
 				</div>
 				<div class="mr50 pull-left">
 					<div class="ss-text pull-left">
 						<em>保存天数：</em>
-						<input class="bt-input-text" id="saveDay" value="" type="number">
+						<input class="bt-input-text" id="save_day" value="" type="number">
 					</div>
 					<div class="ss-text pull-left" style="margin-left:10px">
-						<button class="btn btn-default btn-sm" type="button" onclick="setControl(true);">更改</button>
+						<button class="btn btn-default btn-sm" type="button" onclick="setControl('save_day',true);">更改</button>
 					</div>
 				</div>
-				<div class="mr50 pull-left" style="padding-left:50px; border-left:#ccc 1px solid; margin-right:0">
+				<div class="mr50 pull-left" style="padding-left:10px; border-left:#ccc 1px solid; margin-right:0">
+					<div class="mr50 pull-left">
+						<div class="ss-text pull-left">
+							<em>仅统计外网</em>
+							<div class='ssh-item' id="statAll"></div>
+						</div>
+					</div>
+
 					<button class="btn btn-default btn-sm" type="button" onclick="closeControl()">清空记录</button>
 				</div>
 			</div>

scripts/install/centos.sh

@@ -109,7 +109,7 @@ yum install -y ImageMagick ImageMagick-devel
 
 yum install -y libzstd-devel
 yum install -y libevent libevent-devel unzip zip
-yum install -y python-imaging libicu-devel  bzip2-devel gcc  pcre pcre-devel
+yum install -y python-imaging libicu-devel  bzip2-devel  pcre pcre-devel
 
 yum install -y gd gd-devel
 yum install -y libjpeg-devel libpng-devel libwebp libwebp-devel

task.py

@@ -250,7 +250,7 @@ def systemTask():
                 cpuInfo = tmp
 
             # 取当前网络Io
-            networkIo = psutil.net_io_counters()[:4]
+            networkIo = sm.psutilNetIoCounters()
             if not network_up:
                 network_up = networkIo[0]
                 network_down = networkIo[1]