Merge pull request #819 from midoks/dev

兼容及优化

plugins/php-apt/conf/www.conf

@@ -7,10 +7,10 @@ listen.owner = {$PHP_USER}
 listen.group = {$PHP_GROUP}
 listen.backlog = 4096
 pm = dynamic
-pm.max_children = 50
-pm.start_servers = 5
-pm.min_spare_servers = 5
-pm.max_spare_servers = 35
+pm.max_children = 2
+pm.start_servers = 1
+pm.min_spare_servers = 1
+pm.max_spare_servers = 2
 pm.status_path = /phpfpm_status_apt{$PHP_VERSION}
 pm.max_requests = 1000
 request_terminate_timeout = 30

plugins/php-apt/index.py

@@ -447,7 +447,7 @@ def setFpmConfig(version):
     # if not 'max' in args:
     #     return 'missing time args!'
 
-    version = args['version']
+    # version = args['version']
     max_children = args['max_children']
     start_servers = args['start_servers']
     min_spare_servers = args['min_spare_servers']

plugins/php/install.sh

@@ -8,6 +8,7 @@ rootPath=$(dirname "$rootPath")
 serverPath=$(dirname "$rootPath")
 sysName=`uname`
 
+# cd /www/server/mdserver-web/plugins/php && bash install.sh install 73
 # https://www.php.net/releases
 
 if id www &> /dev/null ;then 

plugins/php/versions/72/install.sh

@@ -10,6 +10,46 @@ sourcePath=${serverPath}/source
 sysName=`uname`
 SYS_ARCH=`arch`
 
+echo "use system: ${sysName}"
+if [ ${sysName} == "Darwin" ]; then
+	OSNAME='macos'
+elif grep -Eq "openSUSE" /etc/*-release; then
+	OSNAME='opensuse'
+	zypper refresh
+elif grep -Eq "FreeBSD" /etc/*-release; then
+	OSNAME='freebsd'
+	pkg install -y wget unzip
+elif grep -Eqi "Arch" /etc/issue || grep -Eq "Arch" /etc/*-release; then
+	OSNAME='arch'
+	echo y | pacman -Sy unzip
+elif grep -Eqi "CentOS" /etc/issue || grep -Eq "CentOS" /etc/*-release; then
+	OSNAME='centos'
+	yum install -y wget zip unzip
+elif grep -Eqi "Fedora" /etc/issue || grep -Eq "Fedora" /etc/*-release; then
+	OSNAME='fedora'
+	yum install -y wget zip unzip
+elif grep -Eqi "Rocky" /etc/issue || grep -Eq "Rocky" /etc/*-release; then
+	OSNAME='rocky'
+	yum install -y wget zip unzip
+elif grep -Eqi "AlmaLinux" /etc/issue || grep -Eq "AlmaLinux" /etc/*-release; then
+	OSNAME='alma'
+	yum install -y wget zip unzip
+elif grep -Eqi "Debian" /etc/issue || grep -Eq "Debian" /etc/*-release; then
+	OSNAME='debian'
+	apt update -y
+	apt install -y devscripts
+	apt install -y wget zip unzip
+elif grep -Eqi "Ubuntu" /etc/issue || grep -Eq "Ubuntu" /etc/*-release; then
+	OSNAME='ubuntu'
+	apt install -y wget zip unzip
+else
+	OSNAME='unknow'
+fi
+
+VERSION_ID=`cat /etc/*-release | grep VERSION_ID | awk -F = '{print $2}' | awk -F "\"" '{print $2}'`
+
+
+
 version=7.2.31
 PHP_VER=72
 md5_file_ok=968adcb8d0c5652b6e191b025fc8ba41
@@ -95,10 +135,18 @@ fi
 # ----- cpu end ------
 
 
-if [ "${SYS_ARCH}" == "arm64" ];then
-	# 修复arm64架构下安装
+RELOAD_CODE(){
 	cat ${curPath}/versions/${PHP_VER}/src/reentrancy.c > $sourcePath/php/php${PHP_VER}/main/reentrancy.c
 	echo "cat ${curPath}/versions/${PHP_VER}/src/reentrancy.c > $sourcePath/php/php${PHP_VER}/main/reentrancy.c"
+}
+
+if [ "${SYS_ARCH}" == "arm64" ];then
+	# 修复arm64架构下安装
+	RELOAD_CODE
+fi
+
+if [ "${OSNAME}" == "debian" ] && [ "${VERSION_ID}" == "13" ];then
+	RELOAD_CODE
 fi
 
 if [ "$sysName" == "Darwin" ];then

plugins/php/versions/73/install.sh

@@ -10,6 +10,45 @@ sourcePath=${serverPath}/source
 sysName=`uname`
 SYS_ARCH=`arch`
 
+echo "use system: ${sysName}"
+if [ ${sysName} == "Darwin" ]; then
+	OSNAME='macos'
+elif grep -Eq "openSUSE" /etc/*-release; then
+	OSNAME='opensuse'
+	zypper refresh
+elif grep -Eq "FreeBSD" /etc/*-release; then
+	OSNAME='freebsd'
+	pkg install -y wget unzip
+elif grep -Eqi "Arch" /etc/issue || grep -Eq "Arch" /etc/*-release; then
+	OSNAME='arch'
+	echo y | pacman -Sy unzip
+elif grep -Eqi "CentOS" /etc/issue || grep -Eq "CentOS" /etc/*-release; then
+	OSNAME='centos'
+	yum install -y wget zip unzip
+elif grep -Eqi "Fedora" /etc/issue || grep -Eq "Fedora" /etc/*-release; then
+	OSNAME='fedora'
+	yum install -y wget zip unzip
+elif grep -Eqi "Rocky" /etc/issue || grep -Eq "Rocky" /etc/*-release; then
+	OSNAME='rocky'
+	yum install -y wget zip unzip
+elif grep -Eqi "AlmaLinux" /etc/issue || grep -Eq "AlmaLinux" /etc/*-release; then
+	OSNAME='alma'
+	yum install -y wget zip unzip
+elif grep -Eqi "Debian" /etc/issue || grep -Eq "Debian" /etc/*-release; then
+	OSNAME='debian'
+	apt update -y
+	apt install -y devscripts
+	apt install -y wget zip unzip
+elif grep -Eqi "Ubuntu" /etc/issue || grep -Eq "Ubuntu" /etc/*-release; then
+	OSNAME='ubuntu'
+	apt install -y wget zip unzip
+else
+	OSNAME='unknow'
+fi
+
+VERSION_ID=`cat /etc/*-release | grep VERSION_ID | awk -F = '{print $2}' | awk -F "\"" '{print $2}'`
+
+
 version=7.3.33
 PHP_VER=73
 md5_file_ok=eeabb2140c04da85c86389197421f890
@@ -105,6 +144,13 @@ else
 fi
 # ----- cpu end ------
 
+
+if [ "${OSNAME}" == "debian" ] && [ "${VERSION_ID}" == "13" ];then
+	# 修复arm64架构下安装
+	cat ${curPath}/versions/${PHP_VER}/src/reentrancy.c > $sourcePath/php/php${PHP_VER}/main/reentrancy.c
+	echo "cat ${curPath}/versions/${PHP_VER}/src/reentrancy.c > $sourcePath/php/php${PHP_VER}/main/reentrancy.c"
+fi
+
 if [ "$sysName" == "Darwin" ];then
 	BREW_DIR=`which brew`
 	BREW_DIR=${BREW_DIR/\/bin\/brew/}

plugins/php/versions/73/src/reentrancy.c

@@ -0,0 +1,442 @@
+/*
+   +----------------------------------------------------------------------+
+   | PHP Version 7                                                        |
+   +----------------------------------------------------------------------+
+   | Copyright (c) 1997-2018 The PHP Group                                |
+   +----------------------------------------------------------------------+
+   | This source file is subject to version 3.01 of the PHP license,      |
+   | that is bundled with this package in the file LICENSE, and is        |
+   | available through the world-wide-web at the following url:           |
+   | http://www.php.net/license/3_01.txt                                  |
+   | If you did not receive a copy of the PHP license and are unable to   |
+   | obtain it through the world-wide-web, please send a note to          |
+   | license@php.net so we can mail you a copy immediately.               |
+   +----------------------------------------------------------------------+
+   | Author: Sascha Schumann <sascha@schumann.cx>                         |
+   +----------------------------------------------------------------------+
+ */
+
+#include <sys/types.h>
+#include <string.h>
+#include <errno.h>
+#ifdef HAVE_DIRENT_H
+#include <dirent.h>
+#endif
+
+#include "php_reentrancy.h"
+#include "ext/standard/php_rand.h"                   /* for PHP_RAND_MAX */
+
+enum {
+	LOCALTIME_R,
+	CTIME_R,
+	ASCTIME_R,
+	GMTIME_R,
+	READDIR_R,
+	NUMBER_OF_LOCKS
+};
+
+#if defined(PHP_NEED_REENTRANCY)
+
+#include <TSRM.h>
+
+static MUTEX_T reentrant_locks[NUMBER_OF_LOCKS];
+
+#define local_lock(x) tsrm_mutex_lock(reentrant_locks[x])
+#define local_unlock(x) tsrm_mutex_unlock(reentrant_locks[x])
+
+#else
+
+#define local_lock(x)
+#define local_unlock(x)
+
+#endif
+
+#if defined(PHP_IRIX_TIME_R)
+
+#define HAVE_CTIME_R 1
+#define HAVE_ASCTIME_R 1
+
+PHPAPI char *php_ctime_r(const time_t *clock, char *buf)
+{
+	if (ctime_r(clock, buf) == buf)
+		return (buf);
+	return (NULL);
+}
+
+PHPAPI char *php_asctime_r(const struct tm *tm, char *buf)
+{
+	if (asctime_r(tm, buf) == buf)
+		return (buf);
+	return (NULL);
+}
+
+#endif
+
+#if defined(PHP_HPUX_TIME_R)
+
+#define HAVE_LOCALTIME_R 1
+#define HAVE_CTIME_R 1
+#define HAVE_ASCTIME_R 1
+#define HAVE_GMTIME_R 1
+
+PHPAPI struct tm *php_localtime_r(const time_t *const timep, struct tm *p_tm)
+{
+	if (localtime_r(timep, p_tm) == 0)
+		return (p_tm);
+	return (NULL);
+}
+
+PHPAPI char *php_ctime_r(const time_t *clock, char *buf)
+{
+	if (ctime_r(clock, buf, 26) != -1)
+		return (buf);
+	return (NULL);
+}
+
+PHPAPI char *php_asctime_r(const struct tm *tm, char *buf)
+{
+	if (asctime_r(tm, buf, 26) != -1)
+		return (buf);
+	return (NULL);
+}
+
+PHPAPI struct tm *php_gmtime_r(const time_t *const timep, struct tm *p_tm)
+{
+	if (gmtime_r(timep, p_tm) == 0)
+		return (p_tm);
+	return (NULL);
+}
+
+#endif
+
+#if !defined(HAVE_POSIX_READDIR_R)
+
+PHPAPI int php_readdir_r(DIR *dirp, struct dirent *entry,
+		struct dirent **result)
+{
+#if defined(HAVE_OLD_READDIR_R)
+	int ret = 0;
+
+	/* We cannot rely on the return value of readdir_r
+	   as it differs between various platforms
+	   (HPUX returns 0 on success whereas Solaris returns non-zero)
+	 */
+	entry->d_name[0] = '\0';
+	readdir_r(dirp, entry, result);
+
+	if (entry->d_name[0] == '\0') {
+		*result = NULL;
+		ret = errno;
+	} else {
+		*result = entry;
+	}
+	return ret;
+#else
+	struct dirent *ptr;
+	int ret = 0;
+
+	local_lock(READDIR_R);
+
+	errno = 0;
+
+	ptr = readdir(dirp);
+
+	if (!ptr && errno != 0)
+		ret = errno;
+
+	if (ptr)
+		memcpy(entry, ptr, sizeof(*ptr));
+
+	*result = ptr;
+
+	local_unlock(READDIR_R);
+
+	return ret;
+#endif
+}
+
+#endif
+
+#if !defined(HAVE_LOCALTIME_R) && defined(HAVE_LOCALTIME)
+
+PHPAPI struct tm *php_localtime_r(const time_t *const timep, struct tm *p_tm)
+{
+	struct tm *tmp;
+
+	local_lock(LOCALTIME_R);
+
+	tmp = localtime(timep);
+	if (tmp) {
+		memcpy(p_tm, tmp, sizeof(struct tm));
+		tmp = p_tm;
+	}
+
+	local_unlock(LOCALTIME_R);
+
+	return tmp;
+}
+
+#endif
+
+#if !defined(HAVE_CTIME_R) && defined(HAVE_CTIME)
+
+PHPAPI char *php_ctime_r(const time_t *clock, char *buf)
+{
+	char *tmp;
+
+	local_lock(CTIME_R);
+
+	tmp = ctime(clock);
+	if (tmp) {
+		strcpy(buf, tmp);
+		tmp = buf;
+	}
+
+	local_unlock(CTIME_R);
+
+	return tmp;
+}
+
+#endif
+
+#if !defined(HAVE_ASCTIME_R) && defined(HAVE_ASCTIME)
+
+PHPAPI char *php_asctime_r(const struct tm *tm, char *buf)
+{
+	char *tmp;
+
+	local_lock(ASCTIME_R);
+
+	tmp = asctime(tm);
+	if (tmp) {
+		strcpy(buf, tmp);
+		tmp = buf;
+	}
+
+	local_unlock(ASCTIME_R);
+
+	return tmp;
+}
+
+#endif
+
+#if !defined(HAVE_GMTIME_R) && defined(HAVE_GMTIME)
+
+PHPAPI struct tm *php_gmtime_r(const time_t *const timep, struct tm *p_tm)
+{
+	struct tm *tmp;
+
+	local_lock(GMTIME_R);
+
+	tmp = gmtime(timep);
+	if (tmp) {
+		memcpy(p_tm, tmp, sizeof(struct tm));
+		tmp = p_tm;
+	}
+
+	local_unlock(GMTIME_R);
+
+	return tmp;
+}
+
+#endif
+
+#if defined(PHP_NEED_REENTRANCY)
+
+void reentrancy_startup(void)
+{
+	int i;
+
+	for (i = 0; i < NUMBER_OF_LOCKS; i++) {
+		reentrant_locks[i] = tsrm_mutex_alloc();
+	}
+}
+
+void reentrancy_shutdown(void)
+{
+	int i;
+
+	for (i = 0; i < NUMBER_OF_LOCKS; i++) {
+		tsrm_mutex_free(reentrant_locks[i]);
+	}
+}
+
+#endif
+
+#ifndef HAVE_RAND_R
+
+/*-
+ * Copyright (c) 1990, 1993
+ *	The Regents of the University of California.  All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. All advertising materials mentioning features or use of this software
+ *    must display the following acknowledgement:
+ *	This product includes software developed by the University of
+ *	California, Berkeley and its contributors.
+ * 4. Neither the name of the University nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ *
+ * Posix rand_r function added May 1999 by Wes Peters <wes@softweyr.com>.
+ */
+
+#include <sys/types.h>
+#include <stdlib.h>
+
+static int
+do_rand(unsigned long *ctx)
+{
+	return ((*ctx = *ctx * 1103515245 + 12345) % ((u_long)PHP_RAND_MAX + 1));
+}
+
+
+PHPAPI int
+php_rand_r(unsigned int *ctx)
+{
+	u_long val = (u_long) *ctx;
+	*ctx = do_rand(&val);
+	return (int) *ctx;
+}
+
+#endif
+
+
+#ifndef HAVE_STRTOK_R
+
+/*
+ * Copyright (c) 1998 Softweyr LLC.  All rights reserved.
+ *
+ * strtok_r, from Berkeley strtok
+ * Oct 13, 1998 by Wes Peters <wes@softweyr.com>
+ *
+ * Copyright (c) 1988, 1993
+ *	The Regents of the University of California.  All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ *    notices, this list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notices, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * 3. All advertising materials mentioning features or use of this software
+ *    must display the following acknowledgement:
+ *
+ *	This product includes software developed by Softweyr LLC, the
+ *      University of California, Berkeley, and its contributors.
+ *
+ * 4. Neither the name of the University nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY SOFTWEYR LLC, THE REGENTS AND CONTRIBUTORS
+ * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
+ * PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL SOFTWEYR LLC, THE
+ * REGENTS, OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED
+ * TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+ * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include <stddef.h>
+
+PHPAPI char *
+php_strtok_r(char *s, const char *delim, char **last)
+{
+    char *spanp;
+    int c, sc;
+    char *tok;
+
+    if (s == NULL && (s = *last) == NULL)
+    {
+	return NULL;
+    }
+
+    /*
+     * Skip (span) leading delimiters (s += strspn(s, delim), sort of).
+     */
+cont:
+    c = *s++;
+    for (spanp = (char *)delim; (sc = *spanp++) != 0; )
+    {
+	if (c == sc)
+	{
+	    goto cont;
+	}
+    }
+
+    if (c == 0)		/* no non-delimiter characters */
+    {
+	*last = NULL;
+	return NULL;
+    }
+    tok = s - 1;
+
+    /*
+     * Scan token (scan for delimiters: s += strcspn(s, delim), sort of).
+     * Note that delim must have one NUL; we stop if we see that, too.
+     */
+    for (;;)
+    {
+	c = *s++;
+	spanp = (char *)delim;
+	do
+	{
+	    if ((sc = *spanp++) == c)
+	    {
+		if (c == 0)
+		{
+		    s = NULL;
+		}
+		else
+		{
+		    char *w = s - 1;
+		    *w = '\0';
+		}
+		*last = s;
+		return tok;
+	    }
+	}
+	while (sc != 0);
+    }
+    /* NOTREACHED */
+}
+
+#endif
+
+/*
+ * Local variables:
+ * tab-width: 4
+ * c-basic-offset: 4
+ * End:
+ * vim600: sw=4 ts=4 fdm=marker
+ * vim<600: sw=4 ts=4
+ */

web/static/app/files.js

@@ -1359,6 +1359,7 @@ function zip(dirName,submits) {
                             <option value="zip">zip (通用格式)</option>\
                             <option value="rar">rar (WinRAR对中文兼容较好)</option>\
                             <option value="7z">7z (压缩率极高的压缩格式)</option>\
+                            <option value="xz">xz (压缩率极高的压缩格式)</option>\
                             </select>\
                         </div>\
                     </div>'
@@ -1394,6 +1395,8 @@ function zip(dirName,submits) {
                     $("#dfile").val(newPathName + '.gz');
                 } else if (z_type == '7z') {
                     $("#dfile").val(newPathName + '.7z');
+                } else if (z_type == 'xz') {
+                    $("#dfile").val(newPathName + '.xz');
                 }
             });
 
@@ -1461,7 +1464,7 @@ function unZip(fileName, type) {
 function isCompressFile(fileName){
     var ext = fileName.split('.');
     var extName = ext[ext.length-1].toLowerCase();
-    var support = ['zip','gz','tgz','rar','7z'];
+    var support = ['zip','gz','tgz','rar','7z','xz'];
     for (x in support) {
         if (support[x]==extName){
             return true;

web/utils/file.py

@@ -147,8 +147,8 @@ def uncompress(sfile, dfile, path):
     if suffix_gz == tar_gz:
         extension = suffix_gz
 
-    if not extension in ['tar.gz', 'gz', 'zip', 'rar', '7z']:
-        return mw.returnData(False, '现在仅支持gz,zip,rar格式解压!')
+    if not extension in ['tar.gz', 'gz', 'zip', 'rar', '7z', 'xz']:
+        return mw.returnData(False, '现在仅支持gz,zip,rar,7z,xz格式解压!')
 
     if extension == 'rar' and not mw.checkBinExist('rar'):
         return mw.returnData(False, 'rar解压命令不存在，请安装!')
@@ -169,10 +169,13 @@ def uncompress(sfile, dfile, path):
             cmd += "&& gunzip -k " + sfile + " > " + tmps + " 2>&1 &"
             mw.execShell(cmd)
         elif extension == 'rar':
-            cmd +=  "&& unrar x " + sfile + " " + dfile + " > " + tmps + " 2>&1 &"
+            cmd += "&& unrar x " + sfile + " " + dfile + " > " + tmps + " 2>&1 &"
             mw.execShell(cmd)
         elif extension == '7z':
-            cmd +=  "&& 7z x " + sfile + " -r -o" + dfile + " > " + tmps + " 2>&1 &"
+            cmd += "&& 7z x " + sfile + " -r -o" + dfile + " > " + tmps + " 2>&1 &"
+            mw.execShell(cmd)
+        elif extension == 'xz':
+            cmd += "&& tar -Jxvf " + sfile + " -C " + dfile + " > " + tmps + " 2>&1 &"
             mw.execShell(cmd)
 
         if os.path.exists(dfile):
@@ -293,8 +296,6 @@ def batchPaste(path, stype):
 
 
 def zip(sfile, dfile, stype, path):
-    
-
     tmps = mw.getPanelDir() + '/logs/panel_exec.log'
     if sfile.find(',') == -1:
         if stype == 'zip':
@@ -305,6 +306,14 @@ def zip(sfile, dfile, stype, path):
             mw.execShell("cd '" + path + "' && 7z a '" + dfile + "' -r '" + sfile + "' > " + tmps + " 2>&1")
         elif stype == 'tar_gz':
             mw.execShell("cd '" + path + "' && tar -zcvf '" + dfile + "' " + sfile + " > " + tmps + " 2>&1")
+        elif stype == 'xz':
+            # if not mw.checkBinExist('xz'):
+            #     return mw.returnData(False, 'xz压缩命令不存在，请安装!')
+            # dfile = dfile.strip(".xz")
+            # cmd = "cd '" + path + "' && tar -cvf '" + dfile + ".tar' " + sfile + " && xz -z '" + dfile + ".tar' > " + tmps + " 2>&1 &"
+            cmd = "cd '" + path + "' && tar -cJf '" + dfile + "' " + sfile + " > " + tmps + " 2>&1"
+            # print(cmd)
+            mw.execShell(cmd)
         elif stype == 'rar':
             if not mw.checkBinExist('rar'):
                 return mw.returnData(False, 'rar压缩命令不存在，请安装!')