Merge pull request #172 from midoks/dev

0.9.6
2026-10-11 01:39:26 +08:00 · 2022-08-22 11:44:39 +08:00 · 2022-08-22 11:43:11 +08:00 · 2022-08-21 12:23:39 +08:00 · 2022-08-17 19:16:51 +08:00 · 2022-08-17 19:14:36 +08:00
25 changed files with 251 additions and 121 deletions
@@ -128,6 +128,7 @@ lib/python*
 bin
 pyvenv.cfg
 include
+share
 pip-selfcheck.json

 scripts/mdserver-web
@@ -141,15 +142,14 @@ data/ssl.pl
 data/edate.pl
 data/osname.pl
 data/system.db-journal
+data/hook_*.json

 plugins/l2tp
 plugins/openlitespeed
 plugins/gdrive
 plugins/mtproxy
 plugins/zimg
+plugins/bk_demo
 debug.out


-
-
-
@@ -1,4 +1,4 @@
-### mdserver-web 0.9.4
+### mdserver-web 0.9.6

 简单的Linux面板,感谢BT.CN写出如此好的web管理软件。我一看到，就知道这是我一直想要的页面化管理方式。
 复制了后台管理界面，按照自己想要的方式写了一版。
@@ -71,11 +71,11 @@ docker run -itd --name mw-server --privileged=true -p 7200:7200 -p 80:80 -p 443:
 ```


-### 版本更新 0.9.4
+### 版本更新 0.9.6

-* 修复maridb的用户管理。
-* OP防火墙优化。
-* phpmyadmin插件优化。
+* 增加插件备份功能.
+* supervisor增加错误日志查看.
+* MariaDB安装源优化.


 ### JSDelivr安装地址
@@ -125,13 +125,12 @@ curl -fsSL  https://raw.githubusercontent.com/midoks/mdserver-web/dev/scripts/up
 ```

 ### 微信赞助
-[![截图](/route/static/img/weixin_zz.jpg)](/route/static/img/weixin_zz.jpg)
+[![截图](https://cdn.jsdelivr.net/gh/midoks/mdserver-web@latest/route/static/img/weixin_zz.jpg)](https://cdn.jsdelivr.net/gh/midoks/mdserver-web@latest/route/static/img/weixin_zz.jpg)


 ### 无图不真相

-[![截图](/route/static/mdw.jpg)](/route/static/mdw.jpg)
-
+[![截图](https://cdn.jsdelivr.net/gh/midoks/mdserver-web@latest/route/static/mdw.jpg)](https://cdn.jsdelivr.net/gh/midoks/mdserver-web@latest/route/static/mdw.jpg)


 ### Stargazers over time
@@ -15,7 +15,7 @@ from flask import request

 class config_api:

-    __version = '0.9.4'
+    __version = '0.9.5'

    def __init__(self):
        pass
@@ -295,9 +295,18 @@ class crontab_api:
    # 取数据列表
    def getDataListApi(self):
        stype = request.form.get('type', '')
+
+        bak_data = []
+
+        if stype == 'sites' or stype == 'databases':
+            hookPath = mw.getPanelDataDir() + "/hook_backup.json"
+            if os.path.exists(hookPath):
+                t = mw.readFile(hookPath)
+                bak_data = json.loads(t)
+
        if stype == 'databases':
            db_list = {}
-            db_list['orderOpt'] = []
+            db_list['orderOpt'] = bak_data
            path = mw.getServerDir() + '/mysql'
            if not os.path.exists(path + '/mysql.db'):
                db_list['data'] = []
@@ -307,8 +316,9 @@ class crontab_api:
            return mw.getJson(db_list)

        data = {}
+        data['orderOpt'] = bak_data
+
        data['data'] = mw.M(stype).field('name,ps').select()
-        data['orderOpt'] = []
        return mw.getJson(data)
    ##### ----- start ----- ###

@@ -411,16 +421,13 @@ class crontab_api:
                'rememory': head + "/bin/bash " + script_dir + '/rememory.sh'
            }
            if param['backup_to'] != 'localhost':
-                cfile = mw.getServerDir() + "/mdserver-web/plugin/" + \
-                    param['backup_to'] + "/" + param['backup_to'] + "_main.py"
-                if not os.path.exists(cfile):
-                    cfile = script_dir + "/backup_" + \
-                        param['backup_to'] + ".py"
+                cfile = mw.getPluginDir() + "/" + \
+                    param['backup_to'] + "/index.py"
                wheres = {
-                    'path': head + "python " + cfile + " path " + param['sname'] + " " + str(param['save']),
-                    'site':   head + "python " + cfile + " site " + param['sname'] + " " + str(param['save']),
-                    'database': head + "python " + cfile + " database " + param['sname'] + " " + str(param['save']),
-                    'logs':   head + "python " + script_dir + "/logs_backup.py " + param['sname'] + log + " " + str(param['save']),
+                    'path': head + "python3 " + cfile + " path " + param['sname'] + " " + str(param['save']),
+                    'site':   head + "python3 " + cfile + " site " + param['sname'] + " " + str(param['save']),
+                    'database': head + "python3 " + cfile + " database " + param['sname'] + " " + str(param['save']),
+                    'logs':   head + "python3 " + script_dir + "/logs_backup.py " + param['sname'] + log + " " + str(param['save']),
                    'rememory': head + "/bin/bash " + script_dir + '/rememory.sh'
                }
            try:
@@ -676,8 +676,7 @@ class files_api:
                    data['encoding'] = 'utf-8'
                if char['encoding'] == 'Big5':
                    data['encoding'] = 'BIG5'
-                if not char['encoding'] in ['GBK', 'utf-8',
-                                            'BIG5']:
+                if not char['encoding'] in ['GBK', 'utf-8', 'BIG5']:
                    data['encoding'] = 'utf-8'
                try:
                    if sys.version_info[0] == 2:
@@ -57,10 +57,22 @@ def getPluginDir():
    return getRunDir() + '/plugins'


+def getPanelDataDir():
+    return getRunDir() + '/data'
+
+
 def getServerDir():
    return getRootDir() + '/server'


+def getLogsDir():
+    return getRootDir() + '/wwwlogs'
+
+
+def getBackupDir():
+    return getRootDir() + '/backup'
+
+
 def getWwwDir():
    file = getRunDir() + '/data/site.pl'
    if os.path.exists(file):
@@ -73,14 +85,6 @@ def setWwwDir(wdir):
    return writeFile(file, wdir)


-def getLogsDir():
-    return getRootDir() + '/wwwlogs'
-
-
-def getBackupDir():
-    return getRootDir() + '/backup'
-
-
 def setBackupDir(bdir):
    file = getRunDir() + '/data/backup.pl'
    return writeFile(file, bdir)
@@ -114,6 +114,7 @@ class plugins_api:
            return mw.returnJson(False, '配置文件不存在!', ())

        pluginInfo = json.loads(mw.readFile(infoJsonPos))
+        self.hookInstall(pluginInfo)

        execstr = "cd " + os.getcwd() + "/plugins/" + \
            name + " && /bin/bash " + pluginInfo["shell"] \
@@ -131,6 +132,55 @@ class plugins_api:
        mw.triggerTask()
        return mw.returnJson(True, '已将安装任务添加到队列!')

+    def hookInstallFile(self, hook_name, info):
+        hookPath = mw.getPanelDataDir() + "/hook_" + hook_name + ".json"
+        data = []
+        if os.path.exists(hookPath):
+            t = mw.readFile(hookPath)
+            data = json.loads(t)
+
+        isNeedAdd = True
+        for x in range(len(data)):
+            if data[x]['title'] == info['title'] and data[x]['name'] == info['name']:
+                isNeedAdd = False
+
+        if isNeedAdd:
+            tmp = {}
+            tmp['title'] = info['title']
+            tmp['name'] = info['name']
+            data.append(tmp)
+        mw.writeFile(hookPath, json.dumps(data))
+
+    def hookUninstallFile(self, hook_name, info):
+        hookPath = mw.getPanelDataDir() + "/hook_" + hook_name + ".json"
+        data = []
+        if os.path.exists(hookPath):
+            t = mw.readFile(hookPath)
+            data = json.loads(t)
+
+        for idx in range(len(data)):
+            if data[idx]['title'] == info['title'] and data[idx]['name'] == info['name']:
+                data.remove(data[idx])
+        mw.writeFile(hookPath, json.dumps(data))
+
+    def hookInstall(self, info):
+        if 'hook' in info:
+            hooks = info['hook']
+            for x in hooks:
+                if x in ['backup']:
+                    self.hookInstallFile(x, info)
+                    return True
+        return False
+
+    def hookUninstall(self, info):
+        if 'hook' in info:
+            hooks = info['hook']
+            for x in hooks:
+                if x in ['backup']:
+                    self.hookUninstallFile(x, info)
+                    return True
+        return False
+
    def uninstallOldApi(self):
        rundir = mw.getRunDir()
        name = request.form.get('name', '')
@@ -147,7 +197,6 @@ class plugins_api:
            return mw.returnJson(False, "配置文件不存在!", ())

        pluginInfo = json.loads(mw.readFile(infoJsonPos))
-
        execstr = "cd " + os.getcwd() + "/plugins/" + \
            name + " && /bin/bash " + pluginInfo["shell"] \
            + " uninstall " + version
@@ -175,13 +224,13 @@ class plugins_api:
            return mw.returnJson(False, "配置文件不存在!", ())

        pluginInfo = json.loads(mw.readFile(infoJsonPos))
-
+        self.hookUninstall(pluginInfo)
        execstr = "cd " + os.getcwd() + "/plugins/" + \
            name + " && /bin/bash " + pluginInfo["shell"] \
            + " uninstall " + version

        data = mw.execShell(execstr)
-        if mw.isAppleSystem():
+        if mw.isDebugMode():
            print(execstr)
            print(data[0], data[1])
        self.removeIndex(name, version)
@@ -793,7 +842,7 @@ class plugins_api:
                    print('getIndexList:', e)

        # 使用gevent模式时,无法使用多进程
-        #plist = self.checkStatusMProcess(plist)
+        # plist = self.checkStatusMProcess(plist)
        plist = self.checkStatusMThreads(plist)
        return plist

@@ -2026,7 +2026,7 @@ location ^~ {from} {
           return 404;
        }
    }
-    # SECURITY-END
+    #SECURITY-END
    include %s/enable-php-''' % (fix.strip().replace(',', '|'), domains.strip().replace(',', ' '), pre_path)
                conf = re.sub(re_path, rconf, conf)
                mw.writeLog('网站管理', '站点[' + name + ']已开启防盗链!')
@@ -684,22 +684,23 @@ class system_api:

                dist_mw = toPath + '/mw.zip'
                if not os.path.exists(dist_mw):
-                    mw.execShell('wget -O ' + dist_mw + ' ' + newUrl)
+                    mw.execShell(
+                        'wget --no-check-certificate -O ' + dist_mw + ' ' + newUrl)

                dist_to = toPath + "/mdserver-web-" + version
                if not os.path.exists(dist_to):
-                    mw.execShell('unzip -o ' + toPath +
-                                 '/mw.zip' + ' -d ' + toPath)
+                    os.system('unzip -o ' + toPath +
+                              '/mw.zip' + ' -d ' + toPath)

-                cmd_cp = "cp -rf " + toPath + '/mdserver-web-' + \
-                    version + "/* " + mw.getServerDir() + "/mdserver-web"
+                cmd_cp = 'cp -rf ' + toPath + '/mdserver-web-' + \
+                    version + '/* ' + mw.getServerDir() + '/mdserver-web'
                mw.execShell(cmd_cp)

                mw.execShell('rm -rf ' + toPath + '/mdserver-web-' + version)
                mw.execShell('rm -rf ' + toPath + '/mw.zip')

                self.restartMw()
-                return mw.returnJson(True, '安装更新成功,需自己重启!')
+                return mw.returnJson(True, '安装更新成功!')

            return mw.returnJson(False, '已经是最新,无需更新!')
        except Exception as ex:
@@ -388,7 +388,7 @@ def postReceiveLog():
 def getGogsConf():
    conf = getConf()
    if not os.path.exists(conf):
-        return mw.returnJson(False, "请先安装初始化!")
+        return mw.returnJson(False, "请先安装初始化!<br/>默认地址:http://" + mw.getLocalIp() + ":3000")

    gets = [
        {'name': 'DOMAIN', 'type': -1, 'ps': '服务器域名'},
@@ -455,7 +455,7 @@ def userList():

    conf = getConf()
    if not os.path.exists(conf):
-        return mw.returnJson(False, "请先安装初始化!")
+        return mw.returnJson(False, "请先安装初始化!<br/>默认地址:http://" + mw.getLocalIp() + ":3000")

    import math
    args = getArgs()
@@ -632,7 +632,7 @@ def isSqlError(mysqlMsg):


 def __createUser(dbname, username, password, address):
-    pdb = pMysqlDb()
+    pdb = pMysqlDb('mysql')

    if username == 'root':
        dbname = '*'
@@ -692,8 +692,8 @@ def importDbBackup():
        mw.execShell(cmd)

    pwd = pSqliteDb('config').where('id=?', (1,)).getField('mysql_root')
-
-    mysql_cmd = mw.getRootDir() + '/server/mysql/bin/mysql -uroot -p' + pwd + \
+    sock = getSocketFile()
+    mysql_cmd = getServerDir() + '/bin/mysql -S ' + sock + ' -uroot -p' + pwd + \
        ' ' + name + ' < ' + file_path_sql

    # print(mysql_cmd)
@@ -1038,7 +1038,7 @@ def delDb():
        id = args['id']
        name = args['name']
        psdb = pSqliteDb('databases')
-        pdb = pMysqlDb()
+        pdb = pMysqlDb('mysql')
        find = psdb.where("id=?", (id,)).field(
            'id,pid,name,username,password,accept,ps,addtime').find()
        accept = find['accept']
@@ -1088,7 +1088,7 @@ def setDbAccess():
        return data[1]
    name = args['username']
    access = args['access']
-    pdb = pMysqlDb()
+    pdb = pMysqlDb('mysql')
    psdb = pSqliteDb('databases')

    dbname = psdb.where('username=?', (name,)).getField('name')
@@ -445,10 +445,9 @@ function syncToDatabase(type){

 function setRootPwd(type, pwd){
    if (type==1){
-        var data = $("#mod_pwd").serialize();
-        myPost('set_root_pwd', data, function(data){
+        var password = $("#MyPassword").val();
+        myPost('set_root_pwd', {password:password}, function(data){
            var rdata = $.parseJSON(data.data);
-            // console.log(rdata);
            showMsg(rdata.msg,function(){
                dbList();
                $('.layui-layer-close1').click();
@@ -459,26 +458,23 @@ function setRootPwd(type, pwd){

    var index = layer.open({
        type: 1,
-        skin: 'demo-class',
        area: '500px',
        title: '修改数据库密码',
        closeBtn: 1,
        shift: 5,
+        btn:["提交","关闭"],
        shadeClose: true,
-        content: "<form class='bt-form pd20 pb70' id='mod_pwd'>\
+        content: "<form class='bt-form pd20' id='mod_pwd'>\
                    <div class='line'>\
-                    <span class='tname'>root密码</span>\
-                    <div class='info-r'><input class='bt-input-text mr5' type='text' name='password' id='MyPassword' style='width:330px' value='"+pwd+"' /><span title='随机密码' class='glyphicon glyphicon-repeat cursor' onclick='repeatPwd(16)'></span></div>\
-                    </div>\
-                    <div class='bt-form-submit-btn'>\
-                        <button id='my_mod_close' type='button' class='btn btn-danger btn-sm btn-title'>关闭</button>\
-                        <button type='button' class='btn btn-success btn-sm btn-title' onclick=\"setRootPwd(1)\" >提交</button>\
+                        <span class='tname'>root密码</span>\
+                        <div class='info-r'><input class='bt-input-text mr5' type='text' name='password' id='MyPassword' style='width:330px' value='"+pwd+"' />\
+                            <span title='随机密码' class='glyphicon glyphicon-repeat cursor' onclick='repeatPwd(16)'></span>\
+                        </div>\
                    </div>\
                  </form>",
-    });
-
-    $('#my_mod_close').click(function(){
-        $('.layui-layer-close1').click();
+        yes:function(){
+            setRootPwd(1);
+        }
    });
 }

@@ -632,12 +628,17 @@ function setDbPass(id, username, password){
                    </div>\
                    <div class='line'>\
                    <span class='tname'>密码</span>\
-                    <div class='info-r'><input class='bt-input-text mr5' type='text' name='password' id='MyPassword' style='width:330px' value='"+password+"' /><span title='随机密码' class='glyphicon glyphicon-repeat cursor' onclick='repeatPwd(16)'></span></div>\
+                    <div class='info-r'>\
+                        <input class='bt-input-text mr5' type='text' name='password' id='MyPassword' style='width:330px' value='"+password+"' />\
+                        <span title='随机密码' class='glyphicon glyphicon-repeat cursor' onclick='repeatPwd(16)'></span></div>\
                    </div>\
                    <input type='hidden' name='id' value='"+id+"'>\
                  </form>",
        yes:function(index){
-            var data = $("#mod_pwd").serialize();
+            var data = {};
+            data['name'] = $('input[name=name]').val();
+            data['password'] = $('#MyPassword').val();
+            data['id'] = $('input[name=id]').val();
            myPost('set_user_pwd', data, function(data){
                var rdata = $.parseJSON(data.data);
                showMsg(rdata.msg,function(){
@@ -14,7 +14,7 @@ sysName=`uname`
 install_tmp=${rootPath}/tmp/mw_install.pl
 mariadbDir=${serverPath}/source/mariadb

-MY_VER=10.6.8
+MY_VER=10.6.9

 Install_app()
 {
@@ -57,10 +57,15 @@ Install_app()
 	fi
 	# ----- cpu end ------

+	# https://mirrors.aliyun.com/mariadb/mariadb-10.8.3/source/mariadb-10.8.3.tar.gz
 	if [ ! -f ${mariadbDir}/mariadb-${MY_VER}.tar.gz ];then
-		# https://mirrors.aliyun.com/mariadb/mariadb-10.8.3/source/mariadb-10.8.3.tar.gz
-		wget -O ${mariadbDir}/mariadb-${MY_VER}.tar.gz --tries=3 https://mirrors.aliyun.com/mariadb/mariadb-${MY_VER}/source/mariadb-${MY_VER}.tar.gz
-		# wget -O ${mariadbDir}/mariadb-${MY_VER}.tar.gz --tries=3 https://downloads.mariadb.org/interstitial/mariadb-${MY_VER}/source/mariadb-${MY_VER}.tar.gz
+		wget --no-check-certificate -O ${mariadbDir}/mariadb-${MY_VER}.tar.gz --tries=3 https://mirrors.aliyun.com/mariadb/mariadb-${MY_VER}/source/mariadb-${MY_VER}.tar.gz
+		
+	fi
+
+	# https://downloads.mariadb.org/interstitial/mariadb-10.6.8/source/mariadb-10.6.8.tar.gz
+	if [ "$?" != "0" ];then
+		wget --no-check-certificate -O ${mariadbDir}/mariadb-${MY_VER}.tar.gz --tries=3 https://downloads.mariadb.org/interstitial/mariadb-${MY_VER}/source/mariadb-${MY_VER}.tar.gz
 	fi

 	if [ ! -d ${mariadbDir}/mariadb-${MY_VER} ];then
@@ -71,10 +76,15 @@ Install_app()
 	if [ "$sysName" == "Darwin" ];then
 		OPTIONS='-DPLUGIN_TOKUDB=NO'
 	fi
-	
+
+	INSTALL_CMD=cmake
+	CMAKE3=`which cmake3`
+	if [ "$?" == "0" ];then
+		INSTALL_CMD=cmake3
+	fi

 	if [ ! -d $serverPath/mariadb ];then
-		cd ${mariadbDir}/mariadb-${MY_VER} && cmake \
+		cd ${mariadbDir}/mariadb-${MY_VER} && $INSTALL_CMD \
 		-DCMAKE_INSTALL_PREFIX=$serverPath/mariadb \
 		-DMYSQL_DATADIR=$serverPath/mariadb/data/ \
 		-DMYSQL_USER=mysql \
@@ -14,7 +14,7 @@ sysName=`uname`
 install_tmp=${rootPath}/tmp/mw_install.pl
 mariadbDir=${serverPath}/source/mariadb

-MY_VER=10.7.4
+MY_VER=10.7.5

 Install_app()
 {
@@ -58,14 +58,16 @@ Install_app()
 	# ----- cpu end ------

 	if [ ! -f ${mariadbDir}/mariadb-${MY_VER}.tar.gz ];then
-		wget -O ${mariadbDir}/mariadb-${MY_VER}.tar.gz --tries=3 https://mirrors.aliyun.com/mariadb/mariadb-${MY_VER}/source/mariadb-${MY_VER}.tar.gz
-		# wget -O ${mariadbDir}/mariadb-${MY_VER}.tar.gz --tries=3 https://downloads.mariadb.org/interstitial/mariadb-${MY_VER}/source/mariadb-${MY_VER}.tar.gz
+		wget --no-check-certificate -O ${mariadbDir}/mariadb-${MY_VER}.tar.gz --tries=3 https://mirrors.aliyun.com/mariadb/mariadb-${MY_VER}/source/mariadb-${MY_VER}.tar.gz
+	fi
+
+	if [ "$?" != "0" ];then
+		wget --no-check-certificate -O ${mariadbDir}/mariadb-${MY_VER}.tar.gz --tries=3 https://downloads.mariadb.org/interstitial/mariadb-${MY_VER}/source/mariadb-${MY_VER}.tar.gz
 	fi

 	if [ ! -d ${mariadbDir}/mariadb-${MY_VER} ];then
 		 cd ${mariadbDir} && tar -zxvf  ${mariadbDir}/mariadb-${MY_VER}.tar.gz
 	fi
-	

 	if [ ! -d $serverPath/mariadb ];then
 		cd ${mariadbDir}/mariadb-${MY_VER} && cmake \
@@ -14,7 +14,7 @@ sysName=`uname`
 install_tmp=${rootPath}/tmp/mw_install.pl
 mariadbDir=${serverPath}/source/mariadb

-MY_VER=10.8.3
+MY_VER=10.8.4

 Install_app()
 {
@@ -58,8 +58,11 @@ Install_app()
 	# ----- cpu end ------

 	if [ ! -f ${mariadbDir}/mariadb-${MY_VER}.tar.gz ];then
-		wget -O ${mariadbDir}/mariadb-${MY_VER}.tar.gz --tries=3 https://mirrors.aliyun.com/mariadb/mariadb-${MY_VER}/source/mariadb-${MY_VER}.tar.gz
-		# wget -O ${mariadbDir}/mariadb-${MY_VER}.tar.gz --tries=3 https://downloads.mariadb.org/interstitial/mariadb-${MY_VER}/source/mariadb-${MY_VER}.tar.gz
+		wget --no-check-certificate -O ${mariadbDir}/mariadb-${MY_VER}.tar.gz --tries=3 https://mirrors.aliyun.com/mariadb/mariadb-${MY_VER}/source/mariadb-${MY_VER}.tar.gz
+	fi
+
+	if [ "$?" != "0" ];then
+		wget --no-check-certificate -O ${mariadbDir}/mariadb-${MY_VER}.tar.gz --tries=3 https://downloads.mariadb.org/interstitial/mariadb-${MY_VER}/source/mariadb-${MY_VER}.tar.gz
 	fi

 	if [ ! -d ${mariadbDir}/mariadb-${MY_VER} ];then
@@ -86,7 +89,7 @@ Install_app()
 		make -j${cpuCore} && make install && make clean

 		if [ -d $serverPath/mariadb ];then
-			echo '10.7' > $serverPath/mariadb/version.pl
+			echo '10.8' > $serverPath/mariadb/version.pl
 			echo '安装完成' > $install_tmp
 		else
 			# rm -rf ${mariadbDir}/mariadb-${MY_VER}
@@ -53,7 +53,7 @@
 .conf_p span {
    display: inline-block;
    margin-right: 10px;
-    width: 95px;
+    width: 135px;
    text-align: right;
 }
 </style>
@@ -821,8 +821,8 @@ def importDbBackup():
        mw.execShell(cmd)

    pwd = pSqliteDb('config').where('id=?', (1,)).getField('mysql_root')
-
-    mysql_cmd = mw.getRootDir() + '/server/mysql/bin/mysql -uroot -p' + pwd + \
+    sock = getSocketFile()
+    mysql_cmd = getServerDir() + '/bin/mysql -S ' + sock + ' -uroot -p' + pwd + \
        ' ' + name + ' < ' + file_path_sql

    # print(mysql_cmd)
@@ -445,10 +445,9 @@ function syncToDatabase(type){

 function setRootPwd(type, pwd){
    if (type==1){
-        var data = $("#mod_pwd").serialize();
-        myPost('set_root_pwd', data, function(data){
+        var password = $("#MyPassword").val();
+        myPost('set_root_pwd', {password:password}, function(data){
            var rdata = $.parseJSON(data.data);
-            // console.log(rdata);
            showMsg(rdata.msg,function(){
                dbList();
                $('.layui-layer-close1').click();
@@ -459,26 +458,23 @@ function setRootPwd(type, pwd){

    var index = layer.open({
        type: 1,
-        skin: 'demo-class',
        area: '500px',
        title: '修改数据库密码',
        closeBtn: 1,
        shift: 5,
+        btn:["提交","关闭"],
        shadeClose: true,
-        content: "<form class='bt-form pd20 pb70' id='mod_pwd'>\
+        content: "<form class='bt-form pd20' id='mod_pwd'>\
                    <div class='line'>\
-                    <span class='tname'>root密码</span>\
-                    <div class='info-r'><input class='bt-input-text mr5' type='text' name='password' id='MyPassword' style='width:330px' value='"+pwd+"' /><span title='随机密码' class='glyphicon glyphicon-repeat cursor' onclick='repeatPwd(16)'></span></div>\
-                    </div>\
-                    <div class='bt-form-submit-btn'>\
-                        <button id='my_mod_close' type='button' class='btn btn-danger btn-sm btn-title'>关闭</button>\
-                        <button type='button' class='btn btn-success btn-sm btn-title' onclick=\"setRootPwd(1)\" >提交</button>\
+                        <span class='tname'>root密码</span>\
+                        <div class='info-r'><input class='bt-input-text mr5' type='text' name='password' id='MyPassword' style='width:330px' value='"+pwd+"' />\
+                            <span title='随机密码' class='glyphicon glyphicon-repeat cursor' onclick='repeatPwd(16)'></span>\
+                        </div>\
                    </div>\
                  </form>",
-    });
-
-    $('#my_mod_close').click(function(){
-        $('.layui-layer-close1').click();
+        yes:function(){
+            setRootPwd(1);
+        }
    });
 }

@@ -632,12 +628,18 @@ function setDbPass(id, username, password){
                    </div>\
                    <div class='line'>\
                    <span class='tname'>密码</span>\
-                    <div class='info-r'><input class='bt-input-text mr5' type='text' name='password' id='MyPassword' style='width:330px' value='"+password+"' /><span title='随机密码' class='glyphicon glyphicon-repeat cursor' onclick='repeatPwd(16)'></span></div>\
+                    <div class='info-r'>\
+                        <input class='bt-input-text mr5' type='text' name='password' id='MyPassword' style='width:330px' value='"+password+"' />\
+                        <span title='随机密码' class='glyphicon glyphicon-repeat cursor' onclick='repeatPwd(16)'></span></div>\
                    </div>\
                    <input type='hidden' name='id' value='"+id+"'>\
                  </form>",
        yes:function(index){
-            var data = $("#mod_pwd").serialize();
+            // var data = $("#mod_pwd").serialize();
+            var data = {};
+            data['name'] = $('input[name=name]').val();
+            data['password'] = $('#MyPassword').val();
+            data['id'] = $('input[name=id]').val();
            myPost('set_user_pwd', data, function(data){
                var rdata = $.parseJSON(data.data);
                showMsg(rdata.msg,function(){
@@ -146,7 +146,7 @@ def contentReplace(content, version):

 def makeOpenrestyConf():
    phpversions = ['00', '52', '53', '54', '55', '56',
-                   '70', '71', '72', '73', '74', '80', '81']
+                   '70', '71', '72', '73', '74', '80', '81', '82']

    sdir = mw.getServerDir()

@@ -39,7 +39,11 @@ if [ ! -d $sourcePath/php/php${PHP_VER} ];then
 	mv $sourcePath/php/php-${version} $sourcePath/php/php${PHP_VER}
 fi

-
+if [ ! -d $sourcePath/php/php${PHP_VER} ];then
+	rm -rf $sourcePath/php/php-${version}.tar.xz
+	echo "reinstall php${version}"
+	exit 1
+fi

 cd $sourcePath/php/php${PHP_VER}

@@ -12,7 +12,7 @@ serverPath=$(dirname "$rootPath")
 sourcePath=${serverPath}/source/php

 LIBNAME=redis
-LIBV=5.3.7
+LIBV=5.3.6
 sysName=`uname`
 actionType=$1
 version=$2
@@ -339,7 +339,10 @@ function createSendTask(name = ''){
                    layer.msg(rdata.msg,{icon:rdata.status?1:2,time:2000,shade: [0.3, '#000']});

                    if (rdata.status){
-                         setTimeout(function(){layer.close(index);},2000);
+                         setTimeout(function(){
+                            layer.close(index);
+                            lsyncdSend();
+                         },2000);
                        return;
                    }
                });
@@ -56,7 +56,7 @@ def getArgs():
        tmp[t[0]] = t[1]
    elif args_len > 1:
        for i in range(len(args)):
-            t = args[i].split(':')
+            t = args[i].split(':', 1)
            tmp[t[0]] = t[1]

    return tmp
@@ -477,6 +477,28 @@ def readConfigLogTpl():
    return mw.returnJson(False, 'OK', '')


+def readConfigLogErrorTpl():
+    args = getArgs()
+    data = checkArgs(args, ['file'])
+    if not data[0]:
+        return data[1]
+    file_log = args['file']
+    line_log = args['line']
+
+    with open(file_log, "r") as fr:
+        infos = fr.readlines()
+
+    stderr_logfile = ''
+    for line in infos:
+        if "stderr_logfile=" in line.strip():
+            stderr_logfile = line.strip().split('=')[1]
+
+    if stderr_logfile != '':
+        data = mw.getNumLines(stderr_logfile, int(line_log))
+        return mw.returnJson(True, 'OK', data)
+    return mw.returnJson(False, 'OK', '')
+
+
 def supClearLog():
    args = getArgs()
    data = checkArgs(args, ['file'])
@@ -529,6 +551,8 @@ if __name__ == "__main__":
        print(readConfigTpl())
    elif func == 'read_config_log_tpl':
        print(readConfigLogTpl())
+    elif func == 'read_config_log_error_tpl':
+        print(readConfigLogErrorTpl())
    elif func == 'sup_clear_log':
        print(supClearLog())
    elif func == 'conf':
@@ -405,7 +405,7 @@ function supConfigTpl(_name, version, func, config_tpl_func, read_config_tpl_fun
 		                return;
 		            }

-    				$("#textBody").empty().text(rdata.data);
+    				$("#textBody").empty().html(rdata.data);
    				$(".CodeMirror").remove();
 		            var editor = CodeMirror.fromTextArea(document.getElementById("textBody"), {
 		                extraKeys: {
@@ -424,7 +424,7 @@ function supConfigTpl(_name, version, func, config_tpl_func, read_config_tpl_fun
 		            $(".CodeMirror-scroll").css({"height":"300px","margin":0,"padding":0});
 		            $("#onlineEditFileBtn").unbind('click');
 		            $("#onlineEditFileBtn").click(function(){
-		                $("#textBody").text(editor.getValue());
+		                $("#textBody").html(editor.getValue());
 		                pluginConfigSave(fileName);
 		            });
    			},'json');
@@ -474,6 +474,7 @@ function supLogs(_name, config_tpl_func, read_config_tpl_func,line){

    var con = '<div><select id="config_tpl" class="bt-input-text mr20" style="width:30%;margin-bottom: 3px;"><option value="0">请选择</option></select>\
    			<button id="sup_clear_log" class="btn btn-success btn-sm clear_logs mr5">清理日志</button>\
+    			<button id="sup_error_log" class="btn btn-success btn-sm clear_logs mr5">查看错误日志</button>\
    		</div>';
    con += '<textarea readonly="" style="margin: 0px;width: 100%;height: 520px;background-color: #333;color:#fff; padding:0 5px" id="info_log"></textarea>';
    $(".soft-man-con").html(con);
@@ -489,6 +490,21 @@ function supLogs(_name, config_tpl_func, read_config_tpl_func,line){
    	});
    }

+    function errorLog(file,file_line){
+    	$('#sup_error_log').click(function(){
+    		var _args = JSON.stringify({file:file,line:file_line});
+			$.post('/plugins/run', {name:_name, func:'read_config_log_error_tpl',args:_args}, function(data){
+				var rdata = $.parseJSON(data.data);
+				if (!rdata.status){
+	                layer.msg(rdata.msg,{icon:0,time:2000,shade: [0.3, '#000']});
+	                return;
+	            }
+
+				$("#info_log").empty().html(rdata.data);
+			},'json');
+    	});
+    }
+
    var loadT = layer.msg('日志路径获取中...',{icon:16,time:0,shade: [0.3, '#000']});
    $.post('/plugins/run', {name:_name, func:_config_tpl_func},function (data) {
        layer.close(loadT);
@@ -517,10 +533,11 @@ function supLogs(_name, config_tpl_func, read_config_tpl_func,line){
 	                return;
 	            }

-				$("#info_log").empty().text(rdata.data);
+				$("#info_log").empty().html(rdata.data);
 			},'json');

 			clearLog(selected);
+			errorLog(selected,file_line);
    	///
    	});

@@ -203,6 +203,7 @@ function planAdd(){
 	$("#set-Config input[name='type']").val(type);
 	
 	var where1 = $("#ptime input[name='where1']").val();
+	
 	var is1;
 	var is2 = 1;
 	switch(type){
@@ -226,6 +227,7 @@ function planAdd(){
 		return;
 	}
 	
+	where1 = $('#excode_week b').attr('val');
 	$("#set-Config input[name='where1']").val(where1);
 	
 	var hour = $("#ptime input[name='hour']").val();
@@ -305,7 +307,9 @@ function planAdd(){
 	
 	$("#set-Config input[name='sName']").val(sName);
 	layer.msg('正在添加,请稍候...!',{icon:16,time:0,shade: [0.3, '#000']});
-	var data= $("#set-Config").serialize() + '&sBody='+sBody + '&urladdress=' + urladdress;
+	var data = $("#set-Config").serialize() + '&sBody='+sBody + '&urladdress=' + urladdress;
+
+	console.log(data);
 	$.post('/crontab/add',data,function(rdata){
 		if(!rdata.status) {
 			layer.msg(rdata.msg,{icon:2, time:2000});
@@ -469,9 +473,9 @@ function toBackup(type){
 			sOpt += '<li><a role="menuitem" tabindex="-1" href="javascript:;" value="'+rdata.data[i].name+'">'+rdata.data[i].name+'['+rdata.data[i].ps+']</a></li>';			
 		}
 		
-		var orderOpt = ''
+		var orderOpt = '';
 		for (var i=0;i<rdata.orderOpt.length;i++){
-			orderOpt += '<li><a role="menuitem" tabindex="-1" href="javascript:;" value="'+rdata.orderOpt[i].value+'">'+rdata.orderOpt[i].name+'</a></li>'
+			orderOpt += '<li><a role="menuitem" tabindex="-1" href="javascript:;" value="'+rdata.orderOpt[i].name+'">'+rdata.orderOpt[i].title+'</a></li>'
 		}
 		

@@ -514,7 +518,7 @@ function editTaskInfo(id){
 	layer.msg('正在获取,请稍候...',{icon:16,time:0,shade: [0.3, '#000']});
 	$.post('/crontab/get_crond_find',{id:id},function(rdata){
 		layer.closeAll();
-		// console.log('init:', rdata);
+		// console.log('get_crond_find:', rdata);
 		var sTypeName = '',sTypeDom = '',cycleName = '',cycleDom = '',weekName = '',weekDom = '',sNameName ='',sNameDom = '',backupsName = '',backupsDom ='';
 		obj = {
 			from:{
@@ -557,10 +561,11 @@ function editTaskInfo(id){

 				if(obj.from.stype == 'site' || obj.from.stype == 'database' || obj.from.stype == 'path' || obj.from.stype == 'logs'){
 					$.post('/crontab/get_data_list',{type:obj.from.stype  == 'databases'?'database':'sites'},function(rdata){
+						// console.log(rdata);
 						obj.sNameArray = rdata.data;
 						obj.sNameArray.unshift({name:'ALL',ps:'所有'});
 						obj.backupsArray = rdata.orderOpt;
-						obj.backupsArray.unshift({name:'服务器磁盘',value:'localhost'});
+						obj.backupsArray.unshift({title:'服务器磁盘',name:'localhost'});
 						for(var i = 0; i <obj['sNameArray'].length; i++){
 							if(obj.from['sname'] == obj['sNameArray'][i]['name']){
 								sNameName  = obj['sNameArray'][i]['ps'];
@@ -568,10 +573,10 @@ function editTaskInfo(id){
 							sNameDom += '<li><a role="menuitem"  href="javascript:;" value="'+ obj['sNameArray'][i]['name'] +'">'+ obj['sNameArray'][i]['ps'] +'</a></li>';
 						}
 						for(var i = 0; i <obj['backupsArray'].length; i++){
-							if(obj.from['backup_to'] == obj['backupsArray'][i]['value'])  {
-								backupsName  = obj['backupsArray'][i]['name'];
+							if(obj.from['backup_to'] == obj['backupsArray'][i]['name'])  {
+								backupsName  = obj['backupsArray'][i]['title'];
 							}
-							backupsDom += '<li><a role="menuitem"  href="javascript:;" value="'+ obj['backupsArray'][i]['value'] +'">'+ obj['backupsArray'][i]['name'] +'</a></li>';
+							backupsDom += '<li><a role="menuitem"  href="javascript:;" value="'+ obj['backupsArray'][i]['name'] +'">'+ obj['backupsArray'][i]['title'] +'</a></li>';
 						}
 						callback();
 					},'json');
@@ -629,7 +634,7 @@ function editTaskInfo(id){
 								<span class="typename controls c4 pull-left f14 text-right mr20">'+ sTypeName  +'</span>\
 								<div style="line-height:34px"><div class="dropdown pull-left mr20 sName_btn" style="display:'+ (obj.from.sType != "path"?'block;':'none') +'">\
 									<button class="btn btn-default dropdown-toggle" type="button"  data-toggle="dropdown" style="width:auto" disabled="disabled">\
-										<b id="sName" val="'+ obj.from.sname +'">'+ sNameName +'</b>\
+										<b id="sName" val="'+ obj.from.sname +'">'+ obj.from.sname +'</b>\
 										<span class="caret"></span>\
 									</button>\
 									<ul class="dropdown-menu" role="menu" aria-labelledby="sName">'+ sNameDom +'</ul>\
@@ -835,10 +840,10 @@ function closeOpt(){
 //星期
 function toWeek(){
 	var mBody = '<div class="dropdown planweek pull-left mr20">\
-				  <button class="btn btn-default dropdown-toggle" type="button" id="excode" data-toggle="dropdown">\
+				  <button class="btn btn-default dropdown-toggle" type="button" id="excode_week" data-toggle="dropdown">\
 					<b val="1">周一</b> <span class="caret"></span>\
 				  </button>\
-				  <ul class="dropdown-menu" role="menu" aria-labelledby="excode">\
+				  <ul class="dropdown-menu" role="menu" aria-labelledby="excode_week">\
 					<li><a role="menuitem" tabindex="-1" href="javascript:;" value="1">周一</a></li>\
 					<li><a role="menuitem" tabindex="-1" href="javascript:;" value="2">周二</a></li>\
 					<li><a role="menuitem" tabindex="-1" href="javascript:;" value="3">周三</a></li>\
Author	SHA1	Message	Date
Mr Chen	42edf12d01	Merge pull request #172 from midoks/dev 0.9.6	2022-08-22 11:44:39 +08:00
midoks	d6799e89c4	0.9.6	2022-08-22 11:43:11 +08:00
midoks	4b4006c9da	Update index.html	2022-08-21 12:23:39 +08:00
midoks	33bb042b41	up	2022-08-17 19:16:51 +08:00
midoks	be2e91b9ce	mariadb up	2022-08-17 19:14:36 +08:00
midoks	db424f8912	mariadb up	2022-08-17 19:12:12 +08:00
midoks	bfca2e313a	Update rsyncd.js	2022-08-17 12:01:28 +08:00
midoks	1de51747e6	Update supervisor.js	2022-08-17 09:28:25 +08:00
midoks	8a623b490b	supervisor增加错误查看	2022-08-17 09:25:08 +08:00
midoks	b5b8ef7e46	Update .gitignore	2022-08-16 22:08:07 +08:00
midoks	daa561b6c4	Update README.md	2022-08-16 18:42:03 +08:00
midoks	9bc30db1ad	Update README.md	2022-08-16 18:38:35 +08:00
midoks	1a9d506d61	Update README.md	2022-08-16 18:35:29 +08:00
midoks	62b5d812e2	Update install.sh	2022-08-16 17:29:10 +08:00
midoks	433c9ab5ea	Update files_api.py	2022-08-16 11:51:46 +08:00
midoks	a7a6976204	增加插件[备份]功能。 1. json: "hook":["backup"] -- 备份钩子开启 2.crontab的执行周期添加优化。	2022-08-16 04:45:21 +08:00
Mr Chen	a1d8523dd9	Merge pull request #165 from midoks/dev 0.9.5	2022-08-15 19:39:36 +08:00
midoks	295e456a20	Update README.md	2022-08-15 19:38:32 +08:00
midoks	453cb4cf14	0.9.5	2022-08-15 19:37:59 +08:00
midoks	56a1ffed2a	Update index.py	2022-08-15 16:14:46 +08:00
midoks	b94f302fbe	gogs 提示更人性	2022-08-15 13:41:01 +08:00
midoks	3a278f4cc6	Update system_api.py	2022-08-15 13:04:52 +08:00
midoks	67b7f9cf43	Update system_api.py	2022-08-15 13:04:32 +08:00
midoks	b3dc24428c	Update system_api.py	2022-08-15 12:48:29 +08:00
midoks	233e6dfc0f	密码字符修复2	2022-08-15 00:17:27 +08:00
midoks	07e74a8947	密码字符修复。	2022-08-14 22:52:25 +08:00
midoks	4eed1e8a93	Update index.py	2022-08-14 20:53:15 +08:00
midoks	1b91af6f22	Update install.sh	2022-08-14 20:32:42 +08:00
midoks	9bc824906b	Update index.py	2022-08-14 20:16:24 +08:00
midoks	394f345764	Update index.py	2022-08-14 20:13:36 +08:00
midoks	a10a11817b	Update install.sh	2022-08-14 20:11:36 +08:00
midoks	6b82dd5eca	Update index.py	2022-08-14 20:04:44 +08:00
midoks	a5d976ad36	Update install.sh	2022-08-14 19:43:49 +08:00
midoks	4bb4746a1b	Update redis.sh	2022-08-14 18:08:39 +08:00
midoks	9fad06585f	Squashed commit of the following: commit `0cf35955d8` Merge: `f99225f1` `7fe6744c` Author: midoks <midoks@163.com> Date: Sun Aug 14 15:44:39 2022 +0800 Merge branch 'master' of github.com:midoks/mdserver-web commit `7fe6744c09` Merge: `cd9b0435` `beb085e9` Author: Mr Chen <midoks@users.noreply.github.com> Date: Sun Aug 14 15:27:42 2022 +0800 Merge pull request #163 from WankkoRee/master 修正`MariaDB 10.8`安装后显示为`MariaDB 10.7`的问题 commit `beb085e95c` Author: Wankko Ree <wkr@wkr.moe> Date: Sun Aug 14 15:19:55 2022 +0800 修正`MariaDB 10.8`安装后显示为`MariaDB 10.7`的问题	2022-08-14 15:44:53 +08:00
midoks	50ed66d26a	Merge branch 'master' into dev	2022-08-14 15:42:11 +08:00
midoks	ed17622a0b	MySQL&MariaDB导入修复	2022-08-14 15:35:59 +08:00
midoks	b8e993cd04	Update index.py	2022-08-14 15:33:08 +08:00
Mr Chen	7fe6744c09	Merge pull request #163 from WankkoRee/master 修正`MariaDB 10.8`安装后显示为`MariaDB 10.7`的问题	2022-08-14 15:27:42 +08:00
Wankko Ree	beb085e95c	修正`MariaDB 10.8`安装后显示为`MariaDB 10.7`的问题	2022-08-14 15:20:34 +08:00
midoks	657f408a8b	Update system_api.py	2022-08-14 10:43:39 +08:00
midoks	3994f1505e	Update system_api.py	2022-08-14 10:18:09 +08:00
midoks	0ecc9307f1	Update site_api.py	2022-08-14 10:17:56 +08:00
midoks	93de3dd3ab	Update system_api.py	2022-08-14 00:47:39 +08:00
midoks	f99225f172	Update system_api.py	2022-08-14 00:46:44 +08:00